xuan/TestEShopDist
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🐞 fix(修改退款码单字段):

Browse Source
This commit is contained in:
czm 2022-10-20 18:43:53 +08:00
parent d4785f07a6
commit eaf25db0bb
2 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/components/checkbox/index.tsx
View File

@ -1,20 +1,20 @@
import { View } from "@tarojs/components" import { View } from '@tarojs/components'
import classnames from "classnames"; import classnames from 'classnames'
import { forwardRef, useEffect, useImperativeHandle, useState } from "react"; import { forwardRef, useEffect, useImperativeHandle, useState } from 'react'
import styles from "./index.module.scss" import styles from './index.module.scss'
type params = { type params = {
onSelect?: () => void, //选择触发 onSelect?: () => void //选择触发
onClose?: () => void, //取消触发 onClose?: () => void //取消触发
status?: false|true //是否选中 status?: false | true //是否选中
disabled?: false|true //是否禁用 disabled?: false | true //是否禁用
} }
export default forwardRef(({onSelect, onClose, status = false, disabled = false}: params, ref) => { export default forwardRef(({ onSelect, onClose, status = false, disabled = false }: params, ref) => {
const [selected, SetSelected] = useState(false) const [selected, SetSelected] = useState(false)
const onSelectEven = () => { const onSelectEven = () => {
if(disabled) return false if (disabled) return false
let res = !selected let res = !selected
if(res) { if (res) {
onSelect?.() onSelect?.()
} else { } else {
onClose?.() onClose?.()
@ -22,7 +22,7 @@ export default forwardRef(({onSelect, onClose, status = false, disabled = false}
SetSelected(res) SetSelected(res)
} }
useImperativeHandle(ref, () => ({ useImperativeHandle(ref, () => ({
onSelectEven onSelectEven,
})) }))
useEffect(() => { useEffect(() => {
SetSelected(status) SetSelected(status)
@ -30,8 +30,8 @@ export default forwardRef(({onSelect, onClose, status = false, disabled = false}
return ( return (
<> <>
<View className={styles.checkbox_main} onClick={() => onSelectEven()}> <View className={styles.checkbox_main} onClick={() => onSelectEven()}>
<View className={classnames(styles.checkbox_item, disabled&&styles.no_checkbox_item, selected&&styles.checkbox_item_select)}> <View className={classnames(styles.checkbox_item, disabled && styles.no_checkbox_item, selected && styles.checkbox_item_select)}>
{selected&&<View className={classnames('iconfont', 'icon-tick', styles.miconfont)}></View>} {selected && <View className={classnames('iconfont', 'icon-tick', styles.miconfont)}></View>}
</View> </View>
</View> </View>
</> </>

6
src/pages/salesAfter/components/returnPayCheck/index.tsx
View File

@ -57,7 +57,7 @@ export default memo(({ show = true, onClose, orderInfo }: Param) => {
weight: formatWeightDiv(citem.actual_weight || citem.estimate_weight).toString(), weight: formatWeightDiv(citem.actual_weight || citem.estimate_weight).toString(),
sale_price: formatPriceDiv(citem.sale_price).toString(), sale_price: formatPriceDiv(citem.sale_price).toString(),
total_price: formatPriceDiv(citem.total_sale_price || citem.estimate_amount).toString(), //小计 total_price: formatPriceDiv(citem.total_sale_price || citem.estimate_amount).toString(), //小计
weight_error: formatWeightDiv(citem.weight_error).toString(), weight_error: formatWeightDiv(citem.settle_weight_error).toString(),
deduction_weight: formatWeightDiv(citem.deductions_weight).toString(), deduction_weight: formatWeightDiv(citem.deductions_weight).toString(),
settle_weight: formatWeightDiv(citem.settle_weight).toString(), settle_weight: formatWeightDiv(citem.settle_weight).toString(),
deduction_amount: formatPriceDiv(citem.deductions_amount).toString(), deduction_amount: formatPriceDiv(citem.deductions_amount).toString(),
@ -67,7 +67,7 @@ export default memo(({ show = true, onClose, orderInfo }: Param) => {
setDetail(() => ({ setDetail(() => ({
title: '售后确认单', title: '售后确认单',
order_type: orderInfo.sale_mode_name, //类型：大货 order_type: orderInfo.sale_mode_name, //类型：大货
sale_user: orderInfo.purchaser_name, client: orderInfo.purchaser_name,
order_created_time: formatDateTime(orderInfo.create_time), order_created_time: formatDateTime(orderInfo.create_time),
order_no: orderInfo.return_order_no, order_no: orderInfo.return_order_no,
pay_account: orderInfo.transfer_remittance_account, pay_account: orderInfo.transfer_remittance_account,
@ -164,7 +164,7 @@ export default memo(({ show = true, onClose, orderInfo }: Param) => {
<Popup show={show} showTitle={false} onClose={onClose}> <Popup show={show} showTitle={false} onClose={onClose}>
<View className={styles.scanPay_con}> <View className={styles.scanPay_con}>
<View className={classnames('iconfont icon-a-moreback', styles.miconfont_title)} onClick={onClose}></View> <View className={classnames('iconfont icon-a-moreback', styles.miconfont_title)} onClick={onClose}></View>
<View className={styles.title}>查看销售码单</View> <View className={styles.title}>查看退款码单</View>
<View className={styles.scanPay_list}> <View className={styles.scanPay_list}>
{(state.loading && <LoadingCard />) || ( {(state.loading && <LoadingCard />) || (
<ScrollView scrollY className={styles.scanPay_list}> <ScrollView scrollY className={styles.scanPay_list}>