Merge branch 'test' into dev

src/pages/transaction/enquirySubmit/components/productModal.tsx

@@ -46,6 +46,7 @@ const comfirmDialog: React.FC<Params> = (props) => {
   const handletOk = async () => {
     try {
       const v = await form.validateFields();
+      console.log(v, 1008611)
       props.onOK(v)
     } catch(err) {
       message.error('有必填项没填写请检查！')
@@ -65,7 +66,7 @@ const comfirmDialog: React.FC<Params> = (props) => {
     }
   }, [])
   const onChange = (e, attrItem) => {
-    const { value } = e.target
+    console.log(e,attrItem, 10086)
   }
 
   const renderTabPanchildren = (item: any) => {
@@ -76,7 +77,6 @@ const comfirmDialog: React.FC<Params> = (props) => {
             const options = attrItem.attributeValueList.map((item: any) => ({
               value: item.value
             }))
-            console.log(attrItem, 10086)
             return (
               <Fragment key={attrItem.id}>
                 {
@@ -121,9 +121,10 @@ const comfirmDialog: React.FC<Params> = (props) => {
                     }]}
                   >
                     <Checkbox.Group onChange={(v) => onChange(v, attrItem)}>
+                      
                       {
-                        attrItem.customerAttributeValueList.length && attrItem.customerAttributeValueList.map((item: any, index: string) => (
-                          <Checkbox key={item.id} value={item.id}>{item.value}</Checkbox>
+                        attrItem.attributeValueList.length && attrItem.attributeValueList.map((item: any, index: string) => (
+                          <Checkbox key={item.id} value={item.value}>{item.value}</Checkbox>
                         ))
                       }
                     </Checkbox.Group>

src/pages/transaction/goodsOffer/addEnquiryOrder/components/basicInfo.tsx

@@ -98,6 +98,7 @@ const BasicInfo: React.FC<queryProps> = (props) => {
   //   }]
   // }
   const fetchMemberList = async (params) => {
+    console.log(params)
     return new Promise((resolve, reject) => {
       PublicApi.getMemberManageLowerMerchantProviderPage(params).then(res => {
         resolve(res.data)

src/pages/transaction/goodsOffer/addEnquiryOrder/components/enquiryGoods.tsx

@@ -170,43 +170,52 @@ const EnquiryGoods: React.FC<queryProps> = (props) => {
   }]
   
   // 模拟数据
-  // const data = [{
-  //   commodityId: 1,
-  //   name: '进口头层黄牛皮荔枝纹/红色/XXL',
-  //   customerCategoryName: '牛皮',
-  //   brandName: 'PELLE',
-  //   unitName: '个',
-
-  // }, {
-  //   commodityId: 2,
-  //   name: '进口头层黄牛皮荔枝纹/红色/XXL',
-  //   customerCategoryName: '牛皮',
-  //   brandName: 'PELLE',
-  //   unitName: '个',
-  // }, {
-  //   commodityId: 3,
-  //   name: '进口头层黄牛皮荔枝纹/红色/XXL',
-  //   customerCategoryName: '牛皮',
-  //   brandName: 'PELLE',
-  //   unitName: '个',
-
-  // }, {
-  //   commodityId: 4,
-  //   name: '进口头层黄牛皮荔枝纹/红色/XXL',
-  //   customerCategoryName: '牛皮',
-  //   brandName: 'PELLE',
-  //   unitName: '个',
-  // }, {
-  //   commodityId: 5,
-  //   name: '进口头层黄牛皮荔枝纹/红色/XXL',
-  //   customerCategoryName: '牛皮',
-  //   brandName: 'PELLE',
-  //   unitName: '个',
-
-  // }]
+  // const data = {
+  //   totalCount: 6,
+  //   data: [{
+  //     commodityId: 1,
+  //     name: '进口头层黄牛皮荔枝纹/红色/XXL',
+  //     customerCategoryName: '牛皮',
+  //     brandName: 'PELLE',
+  //     unitName: '个',
+  
+  //   }, {
+  //     commodityId: 2,
+  //     name: '进口头层黄牛皮荔枝纹/红色/XXL',
+  //     customerCategoryName: '牛皮',
+  //     brandName: 'PELLE',
+  //     unitName: '个',
+  //   }, {
+  //     commodityId: 3,
+  //     name: '进口头层黄牛皮荔枝纹/红色/XXL',
+  //     customerCategoryName: '牛皮',
+  //     brandName: 'PELLE',
+  //     unitName: '个',
+  
+  //   }, {
+  //     commodityId: 4,
+  //     name: '进口头层黄牛皮荔枝纹/红色/XXL',
+  //     customerCategoryName: '牛皮',
+  //     brandName: 'PELLE',
+  //     unitName: '个',
+  //   }, {
+  //     commodityId: 5,
+  //     name: '进口头层黄牛皮荔枝纹/红色/XXL',
+  //     customerCategoryName: '牛皮',
+  //     brandName: 'PELLE',
+  //     unitName: '个',
+  //   }]
+  // }
   const fetchGoodsList = async (params) => {
-    const res = await PublicApi.getMemberManageLowerProviderPage(params)
-    return res.data
+    console.log(params)
+    return new Promise((resolve, reject) => {
+      // setTimeout(() => {
+      //     resolve(data);
+      // }, 1000);
+      PublicApi.getProductCommodityCommonGetCommodityListByBuyer({...params}).then(res => {
+        resolve(res.data)
+      })
+    })
     // return new Promise((resolve, reject) => {
     //   console.log(data, params)
     //   setTimeout(() => {