Skip to content

J
jinfa-platform
Commit 38c2d6b9 authored by XieZhiXiong's avatar XieZhiXiong
Browse files
Options

Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev

parents e1cfef19 27b4f3d2
Hide whitespace changes
Inline Side-by-side
Showing with 166 additions and 106 deletions
src/pages/classAndProperty/class/index.tsx
View file @ 38c2d6b9
......@@ -115,6 +115,9 @@ const ClassProperty: React.FC<{}> = () => {
}
const handlePlateformSelect = (key, node) => {
if (node.children && node.children.length > 0) {
return ;
}
setPlateformSelectNode({id: key*1, name: node._title})
}
......
src/pages/classAndProperty/propertyValue/addPropertyValue.tsx
View file @ 38c2d6b9
......@@ -139,9 +139,14 @@ const AddPropertyValue: React.FC<{}> = () => {
}
const handlePlateformSelect = (key, node) => {
let arr = key.split('_')
setSelectKey(arr[arr.length-1]*1)
setSelectRow(node)
if (node.children && node.children.length > 0) {
return ;
}
if(key){
let arr = key.split('_')
setSelectKey(arr[arr.length-1]*1)
setSelectRow(node)
}
}
const onCommodityAreaChange = (value: any, selected: any) => {
......
src/pages/commodity/products/addProductsItem/priceAttributeForm.tsx
View file @ 38c2d6b9
......@@ -592,6 +592,10 @@ const PriceAttributeForm: React.FC<Iprops> = (props) => {
}
rules={[
{
required: true,
message: '请输入最小起订数'
},
{
pattern: /^\d+(\.\d{1,3})?$/,
message: '最小起订数小数点后仅限三位',
}
......
src/pages/commodity/products/fastModifyPrice.tsx
View file @ 38c2d6b9
......@@ -99,16 +99,24 @@ const FastModifyPrice: React.FC<{}> = () => {
dataIndex: 'min',
key: 'min',
render: (text:any, reocrd:any) => {
if(reocrd.priceType === 1)
return <>￥{reocrd.min} ~ ￥{reocrd.max}</>
if(reocrd.priceType === 3)
return <>{reocrd.min} ~ {reocrd.max}</>
if(reocrd.priceType === 1){
if(reocrd.min === reocrd.min)
return <>￥{reocrd.min}</>
else
return <>￥{reocrd.min} ~ ￥{reocrd.max}</>
}
if(reocrd.priceType === 3){
if(reocrd.min === reocrd.min)
return <>{reocrd.min}</>
else
return <>{reocrd.min} ~ {reocrd.max}</>
}
if(reocrd.priceType === 2)
return null
}
},
{
title: '审核时间',
title: '申请审核时间',
dataIndex: 'applyTime',
key: 'applyTime',
render: (text: any, record: any) => text && moment(text).format('YYYY-MM-DD HH:mm:ss')
......@@ -124,9 +132,9 @@ const FastModifyPrice: React.FC<{}> = () => {
else if (record.status === 2)
component = (<><span className="commonStatusModify"></span>待审核</>)
else if (record.status === 3)
component = (<><span className="commonStatusValid"></span>审核通过</>)
else if (record.status === 4)
component = (<><span className="commonStatusInvalid"></span>审核不通过</>)
else if (record.status === 4)
component = (<><span className="commonStatusValid"></span>审核通过</>)
else if (record.status === 5)
component = (<span style={{ color: '#00B37A', padding: '2px 5px', background: 'rgba(235,247,242,1)', borderRadius: '4px' }}>已上架</span>)
else if (record.status === 6)
......@@ -358,7 +366,7 @@ const FastModifyPrice: React.FC<{}> = () => {
<Col span={4}>
<Select value={filterParams.priceType} onChange={(v) => setFilterParams({ ...filterParams, priceType: +v })} style={{ width: '100%' }} placeholder="商品定价">
<Option value={1}>现货价格</Option>
<Option value={2}>价格需要询价</Option>
{/* <Option value={2}>价格需要询价</Option> */}
<Option value={3}>积分兑换商品</Option>
</Select>
</Col>
......
src/pages/commodity/products/viewProducts.tsx
View file @ 38c2d6b9
......@@ -181,11 +181,15 @@ const viewProducts: React.FC<{}> = () => {
component = (<><span className="commonStatusValid"></span>审核通过</>)
else if (status === 3)
component = (<><span className="commonStatusInvalid"></span>审核不通过</>)
else
component = null
}else
if (status === 5)
component = (<span style={{ color: '#00B37A', padding: '2px 5px', background: 'rgba(235,247,242,1)', borderRadius: '4px' }}>已上架</span>)
else if (status === 6)
component = (<span style={{ padding: '2px 5px', background: 'rgba(244,245,247,1)', borderRadius: '4px' }}>已下架</span>)
else
component = null
return component
}
......@@ -202,13 +206,16 @@ const viewProducts: React.FC<{}> = () => {
<Descriptions colon={true} style={{paddingLeft:128}}>
<Descriptions.Item label="商品品牌">{productDetail?.brand?.name}</Descriptions.Item>
<Descriptions.Item label="商品品类">{productDetail?.customerCategory?.fullName}</Descriptions.Item>
<Descriptions.Item label="上架商城">
{
productDetail?.commodityShopList?.length>0 && productDetail.commodityShopList.map((item, index)=><span key={index}>{item.name}&nbsp;</span>)
productDetail?.commodityShopList?.length>0 &&
<Descriptions.Item label="上架商城">
{
productDetail.commodityShopList.map((item, index)=><span key={index}>{item.name}&nbsp;</span>)
}
</Descriptions.Item>
}
</Descriptions.Item>
<Descriptions.Item label="审核状态">{renderStatus(productDetail?.status, 1)}</Descriptions.Item>
<Descriptions.Item label="商品状态">{renderStatus(productDetail?.status, 2)}</Descriptions.Item>
{renderStatus(productDetail?.status, 1) && <Descriptions.Item label="审核状态">{renderStatus(productDetail?.status, 1)}</Descriptions.Item>}
{renderStatus(productDetail?.status, 2) && <Descriptions.Item label="商品状态">{renderStatus(productDetail?.status, 2)}</Descriptions.Item>}
<Descriptions.Item label="商品类型"><span className="commonStatusValid"></span>{renderCustomerCategoryType(productDetail?.customerCategory?.type)}</Descriptions.Item>
</Descriptions>
</>
......@@ -221,8 +228,9 @@ const viewProducts: React.FC<{}> = () => {
const renderDeliveryType = (type: number) => {
if(type === 1) return '物流（默认）'
if(type === 2) return '自提'
if(type === 3) return '无需配送'
else if(type === 2) return '自提'
else if(type === 3) return '无需配送'
else return null
}
const renderCarriageType = (type: number) => {
......@@ -283,6 +291,7 @@ const viewProducts: React.FC<{}> = () => {
let _imageArrByImageRender: any[] = []
_tableData = unitPriceAndPicList.map((item, index) => {
_imageArrByImageRender.push(item.commodityPic)
console.log(item)
let attrArrayWithObj = item.attributeAndValueList.map(_item=>{
let _temp = {}
_temp[_item.customerAttribute.name] = _item.customerAttributeValue.value
......@@ -338,22 +347,26 @@ const viewProducts: React.FC<{}> = () => {
<Row gutter={[26,0]}>
<Col span={8}>
<Card headStyle={{borderBottom:'none'}} title="基本信息" style={{height:'320px'}}>
<Row>
<Col span={4}>
<p>商品标语：</p>
</Col>
<Col span={20}>
<p>{productDetail?.slogan}</p>
</Col>
</Row>
<Row>
<Col span={4}>
<p>商品卖点：</p>
</Col>
<Col span={20}>
<p>{productDetail?.sellingPoint && productDetail?.sellingPoint.map(_item => <Tag key={_item}>{_item}</Tag>)}</p>
</Col>
</Row>
{
productDetail?.slogan && <Row>
<Col span={4}>
<p>商品标语：</p>
</Col>
<Col span={20}>
<p>{productDetail.slogan}</p>
</Col>
</Row>
}
{
productDetail?.sellingPoint?.length > 0 && <Row>
<Col span={4}>
<p>商品卖点：</p>
</Col>
<Col span={20}>
<p>{productDetail.sellingPoint.map(_item => <Tag key={_item}>{_item}</Tag>)}</p>
</Col>
</Row>
}
<Row>
<Col span={4}>
<p>归属地市：</p>
......@@ -370,54 +383,72 @@ const viewProducts: React.FC<{}> = () => {
</Col>
<Col span={8}>
<Card headStyle={{borderBottom:'none'}} title="物流信息" style={{height:'320px'}}>
<Row>
<Col span={4}>
<p>配送方式：</p>
</Col>
<Col span={20}>
<p>{renderDeliveryType(productDetail?.logistics?.deliveryType)}</p>
</Col>
</Row>
<Row>
<Col span={4}>
<p>运送方式：</p>
</Col>
<Col span={20}>
<p>{renderCarriageType(productDetail?.logistics?.carriageType)}</p>
</Col>
</Row>
<Row>
<Col span={4}>
<p>重量：</p>
</Col>
<Col span={20}>
<p>{productDetail?.logistics?.weight}KG（公斤）</p>
</Col>
</Row>
<Row>
<Col span={4}>
<p>运费模版：</p>
</Col>
<Col span={20}>
<p>{logisticTemplateName}</p>
</Col>
</Row>
<Row>
<Col span={4}>
<p>物流公司：</p>
</Col>
<Col span={20}>
<p>{logisticResourceCompanyName}</p>
</Col>
</Row>
<Row>
<Col span={4}>
<p>发货地址：</p>
</Col>
<Col span={20}>
<p>{logisticResourceSendAddress}</p>
</Col>
</Row>
{
renderDeliveryType(productDetail?.logistics?.deliveryType) &&
<Row>
<Col span={4}>
<p>配送方式：</p>
</Col>
<Col span={20}>
<p>{renderDeliveryType(productDetail?.logistics?.deliveryType)}</p>
</Col>
</Row>
}
{
renderCarriageType(productDetail?.logistics?.carriageType) &&
<Row>
<Col span={4}>
<p>运送方式：</p>
</Col>
<Col span={20}>
<p>{renderCarriageType(productDetail?.logistics?.carriageType)}</p>
</Col>
</Row>
}
{
productDetail?.logistics?.weight &&
<Row>
<Col span={4}>
<p>重量：</p>
</Col>
<Col span={20}>
<p>{productDetail.logistics.weight}KG（公斤）</p>
</Col>
</Row>
}
{
logisticTemplateName &&
<Row>
<Col span={4}>
<p>运费模版：</p>
</Col>
<Col span={20}>
<p>{logisticTemplateName}</p>
</Col>
</Row>
}
{
logisticResourceCompanyName &&
<Row>
<Col span={4}>
<p>物流公司：</p>
</Col>
<Col span={20}>
<p>{logisticResourceCompanyName}</p>
</Col>
</Row>
}
{
logisticResourceSendAddress &&
<Row>
<Col span={4}>
<p>发货地址：</p>
</Col>
<Col span={20}>
<p>{logisticResourceSendAddress}</p>
</Col>
</Row>
}
</Card>
</Col>
<Col span={8}>
......@@ -430,30 +461,39 @@ const viewProducts: React.FC<{}> = () => {
<p>{productDetail?.isInvoice?'是':'否'}</p>
</Col>
</Row>
<Row>
<Col span={4}>
<p>唛头：</p>
</Col>
<Col span={20}>
<p>{productDetail?.marks}</p>
</Col>
</Row>
<Row>
<Col span={4}>
<p>包装清单：</p>
</Col>
<Col span={20}>
<p>{productDetail?.packing}</p>
</Col>
</Row>
<Row>
<Col span={4}>
<p>售后服务：</p>
</Col>
<Col span={20}>
<p>{productDetail?.afterService}</p>
</Col>
</Row>
{
productDetail?.marks &&
<Row>
<Col span={4}>
<p>唛头：</p>
</Col>
<Col span={20}>
<p>{productDetail?.marks}</p>
</Col>
</Row>
}
{
productDetail?.packing &&
<Row>
<Col span={4}>
<p>包装清单：</p>
</Col>
<Col span={20}>
<p>{productDetail?.packing}</p>
</Col>
</Row>
}
{
productDetail?.afterService &&
<Row>
<Col span={4}>
<p>售后服务：</p>
</Col>
<Col span={20}>
<p>{productDetail?.afterService}</p>
</Col>
</Row>
}
</Card>
</Col>
</Row>
......
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