From 1dfce28a75e421ee68ea4efee5d327616ea7a666 Mon Sep 17 00:00:00 2001 From: czm <2192718639@qq.com> Date: Mon, 25 Jul 2022 18:29:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=9F=8E=E6=B5=8B=E8=AF=95=E7=89=88v7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/FromList/index.tsx | 5 ++-- src/components/afterOrderBtns/index.tsx | 18 ++++++------- src/components/orderBtns/index.tsx | 17 +++++++----- src/pages/addressAdd/index.tsx | 2 +- src/pages/order/components/kindList/index.tsx | 5 ++-- src/pages/order/components/payment/index.tsx | 8 ++++-- src/pages/order/index.tsx | 2 +- src/pages/orderList/index.tsx | 2 +- .../salesAfterList/components/order/index.tsx | 8 ++++-- src/pages/salesAfterList/index.tsx | 26 +++++++++++++------ src/pages/user/index.module.scss | 14 ++++++++++ src/pages/user/index.tsx | 15 +++++++---- 12 files changed, 83 insertions(+), 39 deletions(-) diff --git a/src/components/FromList/index.tsx b/src/components/FromList/index.tsx index 0af11d4..c29daf5 100644 --- a/src/components/FromList/index.tsx +++ b/src/components/FromList/index.tsx @@ -9,7 +9,8 @@ interface ListParams{ onClick?:()=>any, //点击列表 placeholder?:string, // 提示文本 children?: any, // 插槽 - type?: string // 类型：1.input,2.textarea,3.select + type?: string // 类型：1.input,2.textarea,3.select, + primordialType?: 'text'|'number'|'idcard'|'digit' value?: any, style?: object, //整行样式 labelStyle?: object, // label样式 @@ -31,7 +32,7 @@ const FromList = memo((props:ListParams)=>{ { type=="input"? - + {value&& props.onInput&&props.onInput({detail: {value: ""}})} className="iconfont icon-qingkong"/> } diff --git a/src/components/afterOrderBtns/index.tsx b/src/components/afterOrderBtns/index.tsx index edcc862..737d006 100644 --- a/src/components/afterOrderBtns/index.tsx +++ b/src/components/afterOrderBtns/index.tsx @@ -63,13 +63,13 @@ export default memo(({orderInfo, onClick, fixedBottom = true}:Param) => { return orderInfo?.is_quality_check } }, - // { - // id: 5, - // label: '上传物流', - // validatarFunc: (orderInfo) => { - // return orderInfo?.stage == ReturnStageWaitCheck.value - // } - // }, + { + id: 5, + label: '上传物流', + validatarFunc: (orderInfo) => { + return orderInfo?.stage == ReturnStageWaitCheck.value + } + }, { id: 6, label: '取消退款', @@ -133,14 +133,14 @@ export default memo(({orderInfo, onClick, fixedBottom = true}:Param) => { {(orderBtnsShowList.length > 0)&& {(orderBtnsShowList.length > 3)&& - setShowMore(true)}>更多 + setShowMore(!showMore)}>{!showMore?'更多':'关闭'} {showMore&& {orderBtnsShowList.map((item, index) => { return ((index >= 3) && submitBtns(item.id, index)}>{item.label}) })} - setShowMore(false)}> + {/* setShowMore(false)}> */} } } diff --git a/src/components/orderBtns/index.tsx b/src/components/orderBtns/index.tsx index 2b06074..2ab63e4 100644 --- a/src/components/orderBtns/index.tsx +++ b/src/components/orderBtns/index.tsx @@ -181,9 +181,7 @@ export default memo(({orderInfo, showStatus = 'detail', onClick}:Param) => { } else if (val == 6) { receiveOrder() } else if(val == 5) { - if(!orderInfo?.av_return_roll) return alert.none('该订单没有可退条数') - await openSubscriptionMessage({orderId: orderInfo?.orderId, scenes: ApplyGoods.value}) - goLink('/pages/applyAfterSales/index',{id:orderInfo?.orderId}) + applyProduct() } else if (val == 3) { bigApplyRefurn() } else if(val == 8) { @@ -191,7 +189,7 @@ export default memo(({orderInfo, showStatus = 'detail', onClick}:Param) => { } else { onClick?.(val) } - }, 600) + }, 800) //大货申请退款 const bigApplyRefurn = () => { @@ -273,6 +271,13 @@ export default memo(({orderInfo, showStatus = 'detail', onClick}:Param) => { } + //申请退货 + const applyProduct = async () => { + if(!orderInfo?.av_return_roll) return alert.none('该订单没有可退条数') + await openSubscriptionMessage({orderId: orderInfo?.orderId, scenes: ApplyGoods.value}) + goLink('/pages/applyAfterSales/index',{id:orderInfo?.orderId}) + } + //显示更多按钮 const [showMore, setShowMore] = useState(false) @@ -283,14 +288,14 @@ export default memo(({orderInfo, showStatus = 'detail', onClick}:Param) => { return ( {(orderBtnsShowList.length > 3)&& - setShowMore(true)}>更多 + setShowMore(!showMore)}>{!showMore?'更多':'关闭'} {showMore&& {orderBtnsShowList.map((item, index) => { return ((index < (orderBtnsShowList.length - 3)) && submitBtns(item.id, index)}>{item.label}) })} - setShowMore(false)}> + {/* setShowMore(false)}> */} } } diff --git a/src/pages/addressAdd/index.tsx b/src/pages/addressAdd/index.tsx index 50c8955..59b1de6 100644 --- a/src/pages/addressAdd/index.tsx +++ b/src/pages/addressAdd/index.tsx @@ -122,7 +122,7 @@ export default ()=>{ return ( setFormData({...formData,name:ev.detail.value})} value={formData["name"]} label="联系人" placeholder="请输入收货人姓名"/> - setFormData({...formData,phone:ev.detail.value})} value={formData["phone"]} label="联系方式" placeholder="请输入联系方式"/> + setFormData({...formData,phone:ev.detail.value})} value={formData["phone"]} label="联系方式" placeholder="请输入联系方式"/> setShowSiteModal(true)} label="收货地址" type="select" placeholder="请选择/省/市/区"/> setFormData({...formData,address_detail:ev.detail.value})} value={formData["address_detail"]} label="详细地址" type="textarea" placeholder="请输入详细地址（街道、门牌号等）"/> diff --git a/src/pages/order/components/kindList/index.tsx b/src/pages/order/components/kindList/index.tsx index 25e3d2f..6023d56 100644 --- a/src/pages/order/components/kindList/index.tsx +++ b/src/pages/order/components/kindList/index.tsx @@ -20,7 +20,8 @@ type OrderParam = { total_weight_error_discount: number, //空差优惠 the_previous_status: number, //取消订单时的订单状态 actual_amount: number, //实付金额 - wait_pay_amount: number //待付金额 + wait_pay_amount: number, //待付金额 + refund_amount: number //退款金额 } type Param = { @@ -90,7 +91,7 @@ export default memo(({order, comfirm = false}:Param) => { field: 'wait_pay_amount', message: '扣除空差后的货款金额', validatarFunc: (order) => { - return order['wait_pay_amount'] > 0 && order['refund_amount'] <= 0 + return order['wait_pay_amount'] > 0 } }, { diff --git a/src/pages/order/components/payment/index.tsx b/src/pages/order/components/payment/index.tsx index f5ff106..3435134 100644 --- a/src/pages/order/components/payment/index.tsx +++ b/src/pages/order/components/payment/index.tsx @@ -95,9 +95,13 @@ export default memo(({show = false, onClose, orderInfo, onSubmitSuccess}:Param) } //账期选择 + const accountPeriodRef = useRef(null) const periodSelectData = (val) => { setSubmitData((e) => ({...e, payment_method:val})) } + const accountPeriodSelect = () => { + accountPeriodRef.current.onSelectEven() + } //订阅消息 const {ToPay} = SUBSCRIPTION_MESSAGE_SCENE @@ -201,7 +205,7 @@ export default memo(({show = false, onClose, orderInfo, onSubmitSuccess}:Param) advanceSelectData(PaymentMethodPreDeposit.value)} onClose={() => advanceSelectData(null)}/> - {show_account_payment&& + {show_account_payment&& @@ -209,7 +213,7 @@ export default memo(({show = false, onClose, orderInfo, onSubmitSuccess}:Param) {account_peyment} - periodSelectData(PaymentMethodAccountPeriod.value)} onClose={() => periodSelectData(null)}/> + periodSelectData(PaymentMethodAccountPeriod.value)} onClose={() => periodSelectData(null)}/> } diff --git a/src/pages/order/index.tsx b/src/pages/order/index.tsx index f36e9b4..9c35ace 100644 --- a/src/pages/order/index.tsx +++ b/src/pages/order/index.tsx @@ -64,7 +64,7 @@ import styles from './index.module.scss' } } Taro.stopPullDownRefresh() - Taro.hideToast() + // Taro.hideToast() } //监听获取到的数据 diff --git a/src/pages/orderList/index.tsx b/src/pages/orderList/index.tsx index 9420e38..3bb3066 100644 --- a/src/pages/orderList/index.tsx +++ b/src/pages/orderList/index.tsx @@ -203,7 +203,7 @@ export default () => { - + {orderData?.list?.map(item => { return })} diff --git a/src/pages/salesAfterList/components/order/index.tsx b/src/pages/salesAfterList/components/order/index.tsx index c81aa4a..8407146 100644 --- a/src/pages/salesAfterList/components/order/index.tsx +++ b/src/pages/salesAfterList/components/order/index.tsx @@ -3,7 +3,6 @@ import { AFTER_ORDER_STATUS, REFUND_STATUS_ORDER } from "@/common/enum"; import { formatHashTag, formatImgUrl, formatPriceDiv } from "@/common/fotmat"; import AfterOrderBtns from "@/components/afterOrderBtns"; import LabAndImg from "@/components/LabAndImg"; -import ApplyRecord from "@/pages/salesAfter/components/applyRecord"; import { useSelector } from "@/reducers/hooks"; import { Image, Text, View } from "@tarojs/components" import classnames from "classnames"; @@ -31,7 +30,10 @@ type Param = { type: number //2 退货 1 预收退款 3 销售 return_apply_order_id: number //退款申请单 refund_amount: number // 退款金额 - is_quality_check: true|false + is_quality_check: true|false, + accessory_url: string[], //物流图片 + take_goods_remark: string, //物流备注 + }, onClickBtn?: (val:{status:number, orderInfo:Param['value']}) => void } @@ -76,6 +78,7 @@ export default memo(({value, onClickBtn}: Param) => { return [ReturnStageQualityCheckPendingRefund.value, ReturnStageServiceOrderPendingRefund.value].includes(value?.stage)?'待退款':value?.stage_name }, [value]) + return ( goLink('/pages/salesAfter/index', {id: value?.id})}> @@ -132,6 +135,7 @@ export default memo(({value, onClickBtn}: Param) => { + ) }) diff --git a/src/pages/salesAfterList/index.tsx b/src/pages/salesAfterList/index.tsx index 03ddf2b..3c96ac3 100644 --- a/src/pages/salesAfterList/index.tsx +++ b/src/pages/salesAfterList/index.tsx @@ -10,8 +10,8 @@ import InfiniteScroll from "@/components/infiniteScroll" import { dataLoadingStatus, getFilterData } from "@/common/util" import OrderStatusList from "./components/orderStatusList" import { GetSaleOrderListApi, RefundOrderSatausApi } from "@/api/salesAfterOrder" -import ReturnLogistics from "./components/returnLogistics" import ApplyRecord from "../salesAfter/components/applyRecord" +import ReturnLogistics from "../salesAfter/components/returnLogistics" export default () => { useLogin() @@ -61,7 +61,7 @@ export default () => { if(orderData.list.length < orderData.total) { pageNum.current.page++ const size = pageNum.current.size * pageNum.current.page - setSearchField({...searchField, size }) + setSearchField((e) => ({...e, size })) } }, [orderData]) @@ -101,18 +101,28 @@ export default () => { getOrderList() } else if (status == 8) { setApplyRecord(true) + } else if (status == 5) { + onShowLogistics(() => true) } setCallBackPayOrderInfo(orderInfo) }, [orderData]) - //物流显示 - const [logisticsShow, setLogisticsShow] = useState(false) - const onCloseLogistics = useCallback(() => setLogisticsShow(false), []) - //显示记录 const [applyRecord, setApplyRecord] = useState(false) - + //物流显示 + const [logisticsShow, setLogisticsShow] = useState(false) + const onShowLogistics = useCallback((val) => { + setLogisticsShow(true) + }, []) + const onCloseLogistics = useCallback(() => { + setLogisticsShow(false) + }, []) + //物流成功上传 + const logisticsSuccess = useCallback(() => { + setLogisticsShow(false) + getOrderList() + }, [orderData]) return ( @@ -126,9 +136,9 @@ export default () => { return })} - setApplyRecord(false)}/> + ) } diff --git a/src/pages/user/index.module.scss b/src/pages/user/index.module.scss index bb82b69..887386e 100644 --- a/src/pages/user/index.module.scss +++ b/src/pages/user/index.module.scss @@ -138,6 +138,20 @@ border-bottom: 2px solid #dddddd; padding: 0 5px 15px; box-sizing: border-box; + .card_main_title_order{ + flex:1 + } + .order_more{ + display: flex; + justify-content: flex-end; + align-items: center; + font-size: 26px; + color: #707070; + text{ + width: auto; + } + } + } .card-main-title text { diff --git a/src/pages/user/index.tsx b/src/pages/user/index.tsx index 517ee8e..03593f8 100644 --- a/src/pages/user/index.tsx +++ b/src/pages/user/index.tsx @@ -225,8 +225,8 @@ const Header = memo((props: any) => { - 订单 - goLink('/pages/orderList/index')}>全部 + 订单 + goLink('/pages/orderList/index')}>全部 { @@ -314,9 +314,14 @@ const Assets = (props: any) => { // 功能 const Main = memo(() => { - let menu = [{ text: "地址管理", icon: "icon-daohang", url: "/pages/addressManager/index" }, { text: "码单管理", icon: "icon-a-yuanmadanmadanguanli", url: "/pages/weightList/index" }, - { text: "我的收藏", icon: "icon-shoucang", url: "/pages/collection/index" }, { text: "颜色对比", icon: "icon-yanseduibi", url: "/pages/sampleComparison/index" }, - { text: "分享推广", icon: "icon-fenxiang" }, { text: "团队邀请", icon: "icon-yaoqingtuandui" }] + let menu = [ + { text: "地址管理", icon: "icon-daohang", url: "/pages/addressManager/index" }, + { text: "码单管理", icon: "icon-a-yuanmadanmadanguanli", url: "/pages/weightList/index" }, + { text: "我的收藏", icon: "icon-shoucang", url: "/pages/collection/index" }, + { text: "颜色对比", icon: "icon-yanseduibi", url: "/pages/sampleComparison/index" }, + // { text: "分享推广", icon: "icon-fenxiang" }, + // { text: "团队邀请", icon: "icon-yaoqingtuandui" } + ] return (