Commit bb3ab56e authored by 前端-许佳敏's avatar 前端-许佳敏

Merge branch 'test' into dev

parents 2b24fb68 cb9e5a6a
...@@ -46,6 +46,7 @@ const comfirmDialog: React.FC<Params> = (props) => { ...@@ -46,6 +46,7 @@ const comfirmDialog: React.FC<Params> = (props) => {
const handletOk = async () => { const handletOk = async () => {
try { try {
const v = await form.validateFields(); const v = await form.validateFields();
console.log(v, 1008611)
props.onOK(v) props.onOK(v)
} catch(err) { } catch(err) {
message.error('有必填项没填写请检查!') message.error('有必填项没填写请检查!')
...@@ -65,7 +66,7 @@ const comfirmDialog: React.FC<Params> = (props) => { ...@@ -65,7 +66,7 @@ const comfirmDialog: React.FC<Params> = (props) => {
} }
}, []) }, [])
const onChange = (e, attrItem) => { const onChange = (e, attrItem) => {
const { value } = e.target console.log(e,attrItem, 10086)
} }
const renderTabPanchildren = (item: any) => { const renderTabPanchildren = (item: any) => {
...@@ -76,7 +77,6 @@ const comfirmDialog: React.FC<Params> = (props) => { ...@@ -76,7 +77,6 @@ const comfirmDialog: React.FC<Params> = (props) => {
const options = attrItem.attributeValueList.map((item: any) => ({ const options = attrItem.attributeValueList.map((item: any) => ({
value: item.value value: item.value
})) }))
console.log(attrItem, 10086)
return ( return (
<Fragment key={attrItem.id}> <Fragment key={attrItem.id}>
{ {
...@@ -121,9 +121,10 @@ const comfirmDialog: React.FC<Params> = (props) => { ...@@ -121,9 +121,10 @@ const comfirmDialog: React.FC<Params> = (props) => {
}]} }]}
> >
<Checkbox.Group onChange={(v) => onChange(v, attrItem)}> <Checkbox.Group onChange={(v) => onChange(v, attrItem)}>
{ {
attrItem.customerAttributeValueList.length && attrItem.customerAttributeValueList.map((item: any, index: string) => ( attrItem.attributeValueList.length && attrItem.attributeValueList.map((item: any, index: string) => (
<Checkbox key={item.id} value={item.id}>{item.value}</Checkbox> <Checkbox key={item.id} value={item.value}>{item.value}</Checkbox>
)) ))
} }
</Checkbox.Group> </Checkbox.Group>
......
...@@ -98,6 +98,7 @@ const BasicInfo: React.FC<queryProps> = (props) => { ...@@ -98,6 +98,7 @@ const BasicInfo: React.FC<queryProps> = (props) => {
// }] // }]
// } // }
const fetchMemberList = async (params) => { const fetchMemberList = async (params) => {
console.log(params)
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
PublicApi.getMemberManageLowerMerchantProviderPage(params).then(res => { PublicApi.getMemberManageLowerMerchantProviderPage(params).then(res => {
resolve(res.data) resolve(res.data)
......
...@@ -170,7 +170,9 @@ const EnquiryGoods: React.FC<queryProps> = (props) => { ...@@ -170,7 +170,9 @@ const EnquiryGoods: React.FC<queryProps> = (props) => {
}] }]
// 模拟数据 // 模拟数据
// const data = [{ // const data = {
// totalCount: 6,
// data: [{
// commodityId: 1, // commodityId: 1,
// name: '进口头层黄牛皮荔枝纹/红色/XXL', // name: '进口头层黄牛皮荔枝纹/红色/XXL',
// customerCategoryName: '牛皮', // customerCategoryName: '牛皮',
...@@ -202,11 +204,18 @@ const EnquiryGoods: React.FC<queryProps> = (props) => { ...@@ -202,11 +204,18 @@ const EnquiryGoods: React.FC<queryProps> = (props) => {
// customerCategoryName: '牛皮', // customerCategoryName: '牛皮',
// brandName: 'PELLE', // brandName: 'PELLE',
// unitName: '个', // unitName: '个',
// }] // }]
// }
const fetchGoodsList = async (params) => { const fetchGoodsList = async (params) => {
const res = await PublicApi.getMemberManageLowerProviderPage(params) console.log(params)
return res.data return new Promise((resolve, reject) => {
// setTimeout(() => {
// resolve(data);
// }, 1000);
PublicApi.getProductCommodityCommonGetCommodityListByBuyer({...params}).then(res => {
resolve(res.data)
})
})
// return new Promise((resolve, reject) => { // return new Promise((resolve, reject) => {
// console.log(data, params) // console.log(data, params)
// setTimeout(() => { // setTimeout(() => {
......
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