From cef0a4c2af7f3f09f30482c89228e4710f9d2ee5 Mon Sep 17 00:00:00 2001 From: czm <2192718639@qq.com> Date: Tue, 14 Jun 2022 16:29:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=AA=E6=9D=BF=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/enum.ts | 14 +- src/components/orderBtns/index copy.tsx | 202 ++++++++++++++++++ src/components/orderBtns/index.tsx | 72 ++++--- .../details/components/orderCount/index.tsx | 20 +- .../addressInfoDetail/index.module.scss | 15 ++ .../components/addressInfoDetail/index.tsx | 51 +++-- .../components/kindList/index.module.scss | 2 +- src/pages/order/components/kindList/index.tsx | 6 +- .../components/orderState/index.module.scss | 34 ++- .../order/components/orderState/index.tsx | 66 ++++-- src/pages/order/index.tsx | 13 +- .../orderList/components/order/index.tsx | 1 + src/use/useLogin.ts | 3 +- 13 files changed, 409 insertions(+), 90 deletions(-) create mode 100644 src/components/orderBtns/index copy.tsx diff --git a/src/common/enum.ts b/src/common/enum.ts index 4e3b378..4191898 100644 --- a/src/common/enum.ts +++ b/src/common/enum.ts @@ -30,16 +30,18 @@ export const AFTER_ORDER_STATUS = { export const PAYMENT_METHOD = { PaymentMethodPreDeposit: {value:1, label:'预存款'}, PaymentMethodAccountPeriod : {value:2, label:'账期'}, - PaymentMethodofflineRemittance: {value:3, label:'线下汇款'}, - PaymentMethodScanCodeToPay: {value:4, label:'扫码支付'}, - PaymentMethodCashOnDelivery: {value:5, label:'货到付款'}, + PaymentMethodofflineRemittance: {value:0, label:'线下汇款'}, + PaymentMethodScanCodeToPay: {value:3, label:'扫码支付'}, + PaymentMethodCashOnDelivery: {value:4, label:'货到付款'}, } -export type PAYMENT_METHOD_PARAM = 1|2|3|4|5 +export type PAYMENT_METHOD_PARAM = 0|1|2|3|4 -//订单模式 +//订单类型 export const SALE_MODE = { - + SaLeModeBulk: {value:0, label:'大货'}, + SaleModeLengthCut: {value:1, label:'剪版'}, + SaLeModeWeightCut: {value:2, label:'散剪'}, } //分享场景枚举 diff --git a/src/components/orderBtns/index copy.tsx b/src/components/orderBtns/index copy.tsx new file mode 100644 index 0000000..d695e16 --- /dev/null +++ b/src/components/orderBtns/index copy.tsx @@ -0,0 +1,202 @@ +import { CancelOrderApi, ReceiveOrderApi } from "@/api/order" +import { alert } from "@/common/common" +import { ORDER_STATUS, SALE_MODE } from "@/common/enum" +import { ScrollView, Text, View } from "@tarojs/components" +import Taro from "@tarojs/taro" +import { useCallback, useRef, memo, useState, useEffect, useMemo } from "react" +import styles from './index.module.scss' + +type Param = { + orderInfo: { + status: number, //订单状态 + orderId: number, //订单id + actual_amount: number, //实付金额 + wait_pay_amount: number, //待付金额 + sale_mode: number //订单类型 + }|null, + onClick?: (val: number) => void //点击后触发的事件，返回订单状态 +} + +export default memo(({orderInfo, onClick}:Param) => { + //订单状态枚举 + const { + SaleOrderStatusBooking, + SaleOrderStatusArranging, + SaleOrderStatusArranged, + SaleOrderStatusWaitingDelivery, + SaleOrderStatusComplete, + SaleOrderStatusRefund, + SaleOrderStatusWaitingPayment, + SaleOrderStatusWaitingReceipt, + SaleOrderStatusAlreadyReceipt, + SaleorderstatusWaitingPrePayment + } = ORDER_STATUS + + //订单类型 + const { + SaLeModeBulk, + SaleModeLengthCut, + SaLeModeWeightCut, + } = SALE_MODE + + //订单按钮按订单状态归类, value是该订单状态，可能该按钮会出现 + const orderBtnsList = useRef([ + { + id: 1, + value: [SaleOrderStatusBooking.value, + SaleOrderStatusArranging.value, + SaleOrderStatusArranged.value, + SaleOrderStatusWaitingPayment.value, + SaleOrderStatusWaitingDelivery.value], //取消订单按钮对应： 待接单，配布中，已配布, 待付款， 待发货 + label: '取消订单' + }, + { + id: 2, + value: [SaleorderstatusWaitingPrePayment.value, SaleOrderStatusWaitingPayment.value, SaleOrderStatusWaitingDelivery.value, SaleOrderStatusWaitingReceipt.value, SaleOrderStatusAlreadyReceipt.value, SaleOrderStatusComplete.value], //去付款按钮对应：待付款， 待发货, 待收货, 已收货, 已完成 + label: '去付款' + }, + { + id: 3, + value: [SaleOrderStatusWaitingDelivery.value], //申请退款按钮对应： 待发货 + label: '申请退款' + }, + { + id: 4, + value: [SaleOrderStatusWaitingReceipt.value, SaleOrderStatusAlreadyReceipt.value, SaleOrderStatusComplete.value, SaleOrderStatusRefund.value], //取消订单按钮对应： 待收货, 已收货, 已完成, 已退款 + label: '查看物流' + }, + { + id: 5, + value: [SaleOrderStatusWaitingReceipt.value, SaleOrderStatusAlreadyReceipt.value, SaleOrderStatusRefund.value], //申请退货按钮对应： 待收货, 已收货, 已退款 + label: '申请退货' + }, + { + id: 6, + value: [SaleOrderStatusWaitingReceipt.value], //确认收货按钮对应： 待收货 + label: '确认收货' + }, + { + id: 7, + value: [SaleOrderStatusWaitingReceipt.value,SaleOrderStatusAlreadyReceipt.value,SaleOrderStatusComplete.value,SaleOrderStatusRefund.value], //再次购买按钮对应： 待收货，已收货，已完成, 已退款 + label: '再次购买' + }, + { + id: 8, + value: [SaleOrderStatusBooking.value], //按钮对应： 待接单 + label: '退款' + }, + ]) + + + //判断是否显示该按钮 + const orderBtnsShow = (item) => { + if(orderInfo) { + if(item.id == 1) { + //取消订单按钮 + return( orderInfo.actual_amount == 0 && item.value.includes(orderInfo.status)) //在待发货之前没有付过款 + } else if (item.id == 2) { + //去付款按钮 + return( orderInfo.wait_pay_amount != 0 && item.value.includes(orderInfo.status)) //只要没有付完款就显示 + } else if(item.id == 3 ) { + //申请退款, 只有大货才有 + return (orderInfo.sale_mode == SaLeModeBulk.value && orderInfo.actual_amount != 0 && item.value.includes(orderInfo.status)) //大货在待发货付过款 + } else if( item.id == 8) { + //退款按钮（直接退款不用申请）, 只有散剪和剪板有 + return (orderInfo.sale_mode != SaLeModeBulk.value && orderInfo.actual_amount != 0 && item.value.includes(orderInfo.status)) //散剪和剪板在待接单时付过款 + } + else { + //其他按钮 + return item.value.includes(orderInfo.status) + } + } + } + + //显示的按钮数组 + const orderBtnsShowList: {id: number, value: any, label: string}[] = useMemo(() => { + return orderBtnsList.current.filter(item => { + return orderBtnsShow(item) + }) + }, [orderInfo]) + + + + //点击按钮操作 + const submitBtns = (val, index) => { + (val == 1)&&cancelOrder(); //取消订单按钮 + (val == 2)&&onClick?.(2); //去付款按钮 + (val == 6)&&receiveOrder(); //确认收货 + + } + + //取消订单 + const {fetchData: cancelFetchData} = CancelOrderApi() + const cancelOrder = () => { + Taro.showModal({ + title: '要取消该订单吗？', + success: async function (res) { + if (res.confirm) { + let res = await cancelFetchData({id: orderInfo?.orderId}) + if(res.success) { + alert.success('取消成功') + onClick?.(1) + } else { + alert.none(res.msg) + } + } else if (res.cancel) { + console.log('用户点击取消') + } + } + }) + } + + //确认订单 + 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(() => { + return {top:`-${(orderBtnsShowList.length - 3)*70 + 10}rpx`, left: `-${10}rpx`} + }, [orderBtnsShowList]) + + return ( + + {(orderBtnsShowList.length > 3)&& + setShowMore(true)}>更多 + {showMore&& + + {orderBtnsShowList.map((item, index) => { + return ((index >= 3) && submitBtns(item.id, index)}>{item.label}) + })} + + setShowMore(false)}> + } + } + + + {orderBtnsShowList.map((item, index) => + (index < 3)&& submitBtns(item.id, index)}>{item.label} + )} + + + + ) +}) \ No newline at end of file diff --git a/src/components/orderBtns/index.tsx b/src/components/orderBtns/index.tsx index cdc409c..3296d83 100644 --- a/src/components/orderBtns/index.tsx +++ b/src/components/orderBtns/index.tsx @@ -1,6 +1,6 @@ import { CancelOrderApi, ReceiveOrderApi } from "@/api/order" import { alert } from "@/common/common" -import { ORDER_STATUS } from "@/common/enum" +import { ORDER_STATUS, SALE_MODE } from "@/common/enum" import { ScrollView, Text, View } from "@tarojs/components" import Taro from "@tarojs/taro" import { useCallback, useRef, memo, useState, useEffect, useMemo } from "react" @@ -12,29 +12,42 @@ type Param = { orderId: number, //订单id actual_amount: number, //实付金额 wait_pay_amount: number, //待付金额 + sale_mode: number //订单类型 }|null, onClick?: (val: number) => void //点击后触发的事件，返回订单状态 } -// export const OrderBtnsemus = [{id:1, label:'取消订单'},{id:2, label:'去付款'},{id:3, label:'申请退款'},{id:4, label:'查看物流'}, {id:5, label:'申请退货'}, {id:6, label:'确认收货'}, {id:7, label:'再次购买'}] export default memo(({orderInfo, onClick}:Param) => { + //订单状态枚举 const { - SaleOrderStatusBooking, - SaleOrderStatusArranging, - SaleOrderStatusArranged, - SaleOrderStatusWaitingDelivery, - SaleOrderStatusComplete, - SaleOrderStatusRefund, - SaleOrderStatusWaitingPayment, - SaleOrderStatusWaitingReceipt, - SaleOrderStatusAlreadyReceipt, - SaleorderstatusWaitingPrePayment - } = ORDER_STATUS + SaleOrderStatusBooking, + SaleOrderStatusArranging, + SaleOrderStatusArranged, + SaleOrderStatusWaitingDelivery, + SaleOrderStatusComplete, + SaleOrderStatusRefund, + SaleOrderStatusWaitingPayment, + SaleOrderStatusWaitingReceipt, + SaleOrderStatusAlreadyReceipt, + SaleorderstatusWaitingPrePayment + } = ORDER_STATUS + + //订单类型 + const { + SaLeModeBulk, + SaleModeLengthCut, + SaLeModeWeightCut, + } = SALE_MODE + //订单按钮按订单状态归类, value是该订单状态，可能该按钮会出现 const orderBtnsList = useRef([ { id: 1, - value: [SaleOrderStatusBooking.value, SaleOrderStatusArranging.value, SaleOrderStatusArranged.value, SaleOrderStatusWaitingPayment.value, SaleOrderStatusWaitingDelivery.value], //取消订单按钮对应： 待接单，配布中，已配布, 待付款， 待发货 + value: [SaleOrderStatusBooking.value, + SaleOrderStatusArranging.value, + SaleOrderStatusArranged.value, + SaleOrderStatusWaitingPayment.value, + SaleOrderStatusWaitingDelivery.value], //取消订单按钮对应： 待接单，配布中，已配布, 待付款， 待发货 label: '取消订单' }, { @@ -44,27 +57,27 @@ export default memo(({orderInfo, onClick}:Param) => { }, { id: 3, - value: [SaleOrderStatusWaitingDelivery.value], //取消订单按钮对应： 待发货 + value: [SaleOrderStatusWaitingDelivery.value], //申请退款按钮对应： 待发货 label: '申请退款' }, - { - id: 4, - value: [SaleOrderStatusWaitingReceipt.value, SaleOrderStatusAlreadyReceipt.value, SaleOrderStatusComplete.value, SaleOrderStatusRefund.value], //取消订单按钮对应： 待收货, 已收货, 已完成, 已退款 - label: '查看物流' - }, + // { + // id: 4, + // value: [SaleOrderStatusWaitingReceipt.value, SaleOrderStatusAlreadyReceipt.value, SaleOrderStatusComplete.value, SaleOrderStatusRefund.value], //取消订单按钮对应： 待收货, 已收货, 已完成, 已退款 + // label: '查看物流' + // }, { id: 5, - value: [SaleOrderStatusWaitingReceipt.value, SaleOrderStatusAlreadyReceipt.value, SaleOrderStatusRefund.value], //取消订单按钮对应： 待收货, 已收货, 已退款 + value: [SaleOrderStatusAlreadyReceipt.value, SaleOrderStatusRefund.value], //申请退货按钮对应：已收货, 已退款 label: '申请退货' }, { id: 6, - value: [SaleOrderStatusWaitingReceipt.value], //取消订单按钮对应： 待收货 + value: [SaleOrderStatusWaitingReceipt.value], //确认收货按钮对应： 待收货 label: '确认收货' }, { id: 7, - value: [SaleOrderStatusWaitingReceipt.value,SaleOrderStatusAlreadyReceipt.value,SaleOrderStatusComplete.value,SaleOrderStatusRefund.value], //取消订单按钮对应： 待收货，已收货，已完成, 已退款 + value: [SaleOrderStatusWaitingReceipt.value,SaleOrderStatusAlreadyReceipt.value,SaleOrderStatusComplete.value,SaleOrderStatusRefund.value], //再次购买按钮对应： 待收货，已收货，已完成, 已退款 label: '再次购买' }, { @@ -74,7 +87,7 @@ export default memo(({orderInfo, onClick}:Param) => { }, ]) - + //判断是否显示该按钮 const orderBtnsShow = (item) => { if(orderInfo) { @@ -84,9 +97,14 @@ export default memo(({orderInfo, onClick}:Param) => { } else if (item.id == 2) { //去付款按钮 return( orderInfo.wait_pay_amount != 0 && item.value.includes(orderInfo.status)) //只要没有付完款就显示 - } else if(item.id == 3) { - //申请退款 - return (orderInfo.actual_amount != 0 && item.value.includes(orderInfo.status)) //在待发货之前付过款 + } else if(item.id == 3 ) { + //申请退款, 只有大货才有 + return (orderInfo.sale_mode == SaLeModeBulk.value && orderInfo.actual_amount != 0 && item.value.includes(orderInfo.status)) //大货在待发货付过款 + } else if( item.id == 8) { + //退款按钮（直接退款不用申请）, 只有散剪和剪板有 + return (orderInfo.sale_mode != SaLeModeBulk.value && orderInfo.actual_amount != 0 && item.value.includes(orderInfo.status)) //散剪和剪板在待接单时付过款 + } else if (item.id == 7) { + return true //再次购买按钮一直存在 } else { //其他按钮 return item.value.includes(orderInfo.status) diff --git a/src/pages/details/components/orderCount/index.tsx b/src/pages/details/components/orderCount/index.tsx index 78d4a8f..f9b122a 100644 --- a/src/pages/details/components/orderCount/index.tsx +++ b/src/pages/details/components/orderCount/index.tsx @@ -144,16 +144,15 @@ export default memo(({show = false, onClose, title = '', productId = 0}: param) const {getSelfUserInfo} = UseLogin() const {fetchData:addFetchData} = AddShoppingCartApi() const addShopCart = async () => { - // try { - // await getSelfUserInfo() - // } catch(msg) { - // Taro.showToast({ - // icon:'none', - // title:'授权失败，请求完善授权' - // }) - // return false - // } - + try { + await getSelfUserInfo() + } catch(msg) { + Taro.showToast({ + icon:'none', + title:'授权失败，请求完善授权' + }) + return false + } if(selectCount.sumCount == 0) { Taro.showToast({ icon:'none', @@ -161,6 +160,7 @@ export default memo(({show = false, onClose, title = '', productId = 0}: param) }) return false } + const state = await addFetchData({ "sale_mode": selectIndex, color_list: selectCount.color_list diff --git a/src/pages/order/components/addressInfoDetail/index.module.scss b/src/pages/order/components/addressInfoDetail/index.module.scss index a480dfa..42dd5d1 100644 --- a/src/pages/order/components/addressInfoDetail/index.module.scss +++ b/src/pages/order/components/addressInfoDetail/index.module.scss @@ -89,6 +89,21 @@ } } + .logisticsBtn{ + width: 152px; + height: 72px; + background: #ffffff; + border: 2px solid #dddddd; + border-radius: 38px; + position: absolute; + bottom: 10px; + right: 10px; + z-index: 999; + font-size: 28px; + color: #707070; + text-align: center; + line-height: 72px; + } .order_address_text_no{ flex: 1; font-size: $font_size; diff --git a/src/pages/order/components/addressInfoDetail/index.tsx b/src/pages/order/components/addressInfoDetail/index.tsx index f42ddf8..c2a7fa0 100644 --- a/src/pages/order/components/addressInfoDetail/index.tsx +++ b/src/pages/order/components/addressInfoDetail/index.tsx @@ -1,11 +1,12 @@ import { EditSaleOrderAddressApi, EditSaleOrderShipmentModeApi } from "@/api/order"; import { alert } from "@/common/common"; +import { ORDER_STATUS } from "@/common/enum"; import { debounce } from "@/common/util"; import AddressList from "@/components/AddressList"; import Popup from "@/components/popup"; import { Text, View } from "@tarojs/components" import classnames from "classnames"; -import { forwardRef, memo, useCallback, useEffect, useImperativeHandle, useMemo, useState } from "react"; +import { forwardRef, memo, useEffect, useImperativeHandle, useMemo, useState } from "react"; import styles from './index.module.scss' export type AddressInfoParam = { @@ -18,15 +19,18 @@ export type AddressInfoParam = { phone: string, } type Param = { - onSelect?: (val:any) => void, //选择 + onSelect?: (val:any) => void, //选择地址 defaultValue?: AddressInfoParam|null, //默认值 disabled?: false|true, //true禁用后只用于展示 - shipment_mode?: 1|2, //1自提 2物流 onChangeShipmentMode?: (val: number) => void, //返回收货方式 - orderId?: number //订单id + orderInfo?: { + orderId: number //订单id + shipment_mode: 1|2, //1自提 2物流 + status: number //订单状态 + } } -export default memo(forwardRef(({onSelect, onChangeShipmentMode, defaultValue = null, orderId = 0, shipment_mode = 1}: Param, ref) => { +export default memo(forwardRef(({onSelect, onChangeShipmentMode, defaultValue = null, orderInfo}: Param, ref) => { const [showAddressList, setShowAddressList] = useState(false) useEffect(() => { @@ -42,13 +46,14 @@ export default memo(forwardRef(({onSelect, onChangeShipmentMode, defaultValue = }, [userInfo]) const changeShow = () => { - if(receivingStatus == 2) + if(receivingStatus == 2 && !logisticsShow) setShowAddressList(() => true) } useEffect(() => { - setReceivingStatus(() => shipment_mode) - }, [shipment_mode]) + if(orderInfo) + setReceivingStatus(() => orderInfo.shipment_mode) + }, [orderInfo]) //把内部方法提供给外部 useImperativeHandle(ref, () => ({ @@ -63,8 +68,9 @@ export default memo(forwardRef(({onSelect, onChangeShipmentMode, defaultValue = changeReceivingStatus(value) } const changeReceivingStatus = debounce(async (value) => { + if(!orderInfo) return false alert.loading('正在修改') - const res = await shipmentModeFetchData({id: orderId, shipment_mode:value}) + const res = await shipmentModeFetchData({id: orderInfo.orderId, shipment_mode:value}) if(res.success) { alert.success('收货方式修改成功') onChangeShipmentMode?.(value) @@ -78,8 +84,9 @@ export default memo(forwardRef(({onSelect, onChangeShipmentMode, defaultValue = const [addressId, setAddressId] = useState(0) const {fetchData: addressFetchData} = EditSaleOrderAddressApi() const getAddress = async (value) => { + if(!orderInfo) return false alert.loading('正在修改') - const res = await addressFetchData({id: orderId, address_id: value.id}) + const res = await addressFetchData({id: orderInfo.orderId, address_id: value.id}) if(res.success) { alert.success('地址修改成功') onSelect?.(value) @@ -91,6 +98,21 @@ export default memo(forwardRef(({onSelect, onChangeShipmentMode, defaultValue = } } + //订单状态 + const { + SaleOrderStatusWaitingReceipt, + SaleOrderStatusAlreadyReceipt, + SaleOrderStatusComplete, + SaleOrderStatusRefund, + SaleOrderStatusCancel + } = ORDER_STATUS + + //根据订单状态判断是否显示物流 + const logisticsShowList = [SaleOrderStatusWaitingReceipt.value, SaleOrderStatusAlreadyReceipt.value, SaleOrderStatusComplete.value, SaleOrderStatusRefund.value, SaleOrderStatusCancel.value] + const logisticsShow = useMemo(() => { + return logisticsShowList.includes(orderInfo?.status as number) + }, [orderInfo]) + return ( changeShow()}> @@ -98,20 +120,23 @@ export default memo(forwardRef(({onSelect, onChangeShipmentMode, defaultValue = {formatAddress} - {(receivingStatus == 2)&&} + {(receivingStatus == 2 && !logisticsShow)&&} {userInfo?.name} {userInfo?.phone} - + {!logisticsShow&& onReceivingStatus(1,e)}>自提 onReceivingStatus(2,e)}>物流 - + || + + 查看物流 + } setShowAddressList(false)}> diff --git a/src/pages/order/components/kindList/index.module.scss b/src/pages/order/components/kindList/index.module.scss index 2d9b040..a4b4c9e 100644 --- a/src/pages/order/components/kindList/index.module.scss +++ b/src/pages/order/components/kindList/index.module.scss @@ -40,7 +40,7 @@ .order_list_item { display: flex; - &:nth-child(2) { + &:nth-child(n + 2) { margin-top: 30px; } .order_list_item_img{ diff --git a/src/pages/order/components/kindList/index.tsx b/src/pages/order/components/kindList/index.tsx index 26241d2..aba9f02 100644 --- a/src/pages/order/components/kindList/index.tsx +++ b/src/pages/order/components/kindList/index.tsx @@ -40,8 +40,10 @@ export default memo(({order, comfirm = false}:Param) => { //数量格式 const numText = useMemo(() => { - if(order) - return `${order?.total_fabrics}种面料，${order?.total_colors}种颜色，共${order?.total_number}${order?.unit}` + if(order) { + let total_number = order?.sale_mode == 0?order?.total_number:(order?.total_number/100) + return `${order?.total_fabrics}种面料，${order?.total_colors}种颜色，共${total_number}${order?.unit}` + } }, [order]) const { diff --git a/src/pages/order/components/orderState/index.module.scss b/src/pages/order/components/orderState/index.module.scss index 90dbcbb..44e9be0 100644 --- a/src/pages/order/components/orderState/index.module.scss +++ b/src/pages/order/components/orderState/index.module.scss @@ -15,7 +15,7 @@ } .order_status_item{ position: relative; - padding-left: 50px; + // padding-left: 50px; &:nth-last-child(n+2) { padding-bottom: 30px; } @@ -44,6 +44,7 @@ .order_status_content{ display: flex; align-items: center; + padding: 0 30px; .order_status_title{ color: $color_font_two; font-size: $font_size; @@ -75,6 +76,24 @@ .order_status_des_select{ color: $color_font_one; } + .pay_time{ + height: 56px; + background: #f6f6f6; + border-radius: 20px; + color: #3C3C3C; + font-size: 24px; + display: flex; + align-items: center; + justify-content: center; + font-weight: 700; + margin-top: 20px; + text{ + font-size: 28px; + color: $color_main; + padding: 0 10px; + + } + } } .more{ width: 100%; @@ -102,4 +121,17 @@ top: -10px; right: -10px; } + .refresh{ + position: absolute; + top: 23px; + right: 20px; + display: flex; + color: #707070; + .mconfont{ + font-size: 30px; + } + .refresh_text{ + font-size: 23px; + } + } } \ No newline at end of file diff --git a/src/pages/order/components/orderState/index.tsx b/src/pages/order/components/orderState/index.tsx index 18ac43d..9c2409d 100644 --- a/src/pages/order/components/orderState/index.tsx +++ b/src/pages/order/components/orderState/index.tsx @@ -3,40 +3,53 @@ import { memo, useMemo, useState } from "react" import styles from './index.module.scss' import classnames from "classnames"; import { formatDateTime, formatImgUrl } from "@/common/fotmat"; -import { PAYMENT_METHOD, PAYMENT_METHOD_PARAM } from "@/common/enum"; +import { ORDER_STATUS, PAYMENT_METHOD, PAYMENT_METHOD_PARAM } from "@/common/enum"; - - -type Param = { - list: { - status: string, - time: string, - tag: string, - desc: string - }[], - payment_method: 0|PAYMENT_METHOD_PARAM, - +type List = { + status: string, + time: string, + tag: string, + desc: string } -//支付方式枚举 -const { - PaymentMethodAccountPeriod, - PaymentMethodCashOnDelivery, -} = PAYMENT_METHOD +type Param = { + onRefresh?: () => void, + orderInfo?: { + logistics_details:List[], //订单状态列表 + payment_method: 0|PAYMENT_METHOD_PARAM, //支付方式 + status: number //订单状态 + } +} -export default memo(({list = [], payment_method = 0}:Param) => { + + +export default memo(({orderInfo = {logistics_details: [],payment_method: 0, status: 0}, onRefresh}:Param) => { const [showMore, setShowMore] = useState(false) const changeMore = () => { setShowMore(() => !showMore) } const dataList = useMemo(() => { - return list.reverse() - }, [list]) + return orderInfo?.logistics_details?.reverse()||[] + }, [orderInfo]) + + //订单状态枚举 + const {SaleorderstatusWaitingPrePayment} = ORDER_STATUS + + //支付方式枚举 + const { + PaymentMethodAccountPeriod, + PaymentMethodCashOnDelivery, + } = PAYMENT_METHOD + + //倒计时 + const count_down = useMemo(() => { + + }, [orderInfo]) return ( <> - {(dataList.length > 0)&& + {(dataList?.length > 0)&& {dataList.map((item, index) => {(dataList.length > 1)&&} @@ -47,6 +60,9 @@ export default memo(({list = [], payment_method = 0}:Param) => { {/* {item.tag} */} {item.desc} + {(orderInfo.status == SaleorderstatusWaitingPrePayment.value)&& + 剩23:58:55支付关闭，订单自动取消 + } )} {(dataList.length > 2) && changeMore()}> @@ -54,8 +70,12 @@ export default memo(({list = [], payment_method = 0}:Param) => { } - {(payment_method == PaymentMethodCashOnDelivery.value)&&} - {(payment_method == PaymentMethodAccountPeriod.value)&&} + {(orderInfo.payment_method == PaymentMethodCashOnDelivery.value)&&} + {(orderInfo.payment_method == PaymentMethodAccountPeriod.value)&&} + + + + 刷新 } diff --git a/src/pages/order/index.tsx b/src/pages/order/index.tsx index 8664081..3a1f520 100644 --- a/src/pages/order/index.tsx +++ b/src/pages/order/index.tsx @@ -126,6 +126,11 @@ import styles from './index.module.scss' setPayMentShow(true) } + //地址组件所需数据 + const addressInfoDetailData = useMemo(() => { + return {orderId:orderDetail?.id, shipment_mode:orderDetail?.shipment_mode, status: orderDetail?.status} + }, [orderDetail]) + //打开地址修改 const addressRef = useRef(null) @@ -174,6 +179,7 @@ import styles from './index.module.scss' settle_mode: orderDetail?.settle_mode, actual_amount: orderDetail?.actual_amount, //实付金额 wait_pay_amount: orderDetail?.wait_pay_amount, //待付金额 + sale_mode: orderDetail?.sale_mode, //订单类型 } }, [orderDetail]) @@ -184,12 +190,9 @@ import styles from './index.module.scss' return ( - {/* - - */} - + - + diff --git a/src/pages/orderList/components/order/index.tsx b/src/pages/orderList/components/order/index.tsx index f96a49e..466bc5e 100644 --- a/src/pages/orderList/components/order/index.tsx +++ b/src/pages/orderList/components/order/index.tsx @@ -55,6 +55,7 @@ export default memo(({value, onClickBtn}: Param) => { orderId: value?.id, actual_amount: value?.actual_amount, //实付金额 wait_pay_amount: value?.wait_pay_amount, //待付金额 + sale_mode: value?.sale_mode, //订单类型 } }, [value]) diff --git a/src/use/useLogin.ts b/src/use/useLogin.ts index d65cc51..cbdde48 100644 --- a/src/use/useLogin.ts +++ b/src/use/useLogin.ts @@ -75,10 +75,9 @@ export default () => { }) if(user_res.success) { setUserInfo({...user_res.data}) - getAdminUserInfo() + reslove(true) } else { - console.log('aaa:::',user_res.msg) reject(user_res.msg) } },