Commit f77a49f5 authored by 前端-钟卫鹏's avatar 前端-钟卫鹏

fix: 新增商品设置价格大于0,处理英文站销售订单查询状态显示超出问题

parent adc65952
......@@ -965,7 +965,7 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
rules={[
{ required: true, message: intl.formatMessage({ id: 'commodity.products.addProductsItem.priceAttributeForm.modal.form.numberPrice.message.1' }) },
{
pattern: /^\d+(\.\d{1,4})?$/,
pattern: /^([0](\.\d{1,4}))$|^([1-9][0-9]*(\.\d{1,4})?)$/,
message: intl.formatMessage({ id: 'commodity.products.addProductsItem.priceAttributeForm.modal.form.numberPrice.message.2' }),
}
]}
......@@ -1021,7 +1021,7 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
message: planPrice === 3 ? intl.formatMessage({ id: 'commodity.products.addProductsItem.priceAttributeForm.modal.form.uniquePrice.message.1' }) : intl.formatMessage({ id: 'commodity.products.addProductsItem.priceAttributeForm.modal.form.uniquePrice.message.2' })
},
{
pattern: planPrice !== 3 ? /^\d+(\.\d{1,4})?$/ : /^[1-9]\d*$/,
pattern: planPrice !== 3 ? /^([0](\.\d{1,4}))$|^([1-9][0-9]*(\.\d{1,4})?)$/ : /^[1-9]\d*$/,
message: planPrice !== 3 ? intl.formatMessage({ id: 'commodity.products.addProductsItem.priceAttributeForm.modal.form.uniquePrice.message.3' }) : intl.formatMessage({ id: 'commodity.products.addProductsItem.priceAttributeForm.modal.form.uniquePrice.message.4' }),
}
]}
......
......@@ -89,7 +89,17 @@ const matchStatusColor = (status: number): string => {
const StatusColors: React.FC<StatusColorsProps> = (props) => {
const { status, type, text = null } = props
const statusShowColor = matchStatusColor(status)
return (<Tag color={statusShowColor}>{text}</Tag>)
// return (<Tag color={statusShowColor} style={{whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis'}}>{text}</Tag>)
return (<p style={{
width: 100,
whiteSpace: 'nowrap',
overflow: 'hidden',
textOverflow: 'ellipsis',
// backgroundColor: '#ef6260',
padding: '0 7px',
// borderRadius: '2px',
// color: 'white'
}} title={text}>{text}</p>)
}
StatusColors.defaultProps = {}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment