对照接口文档,参数对接

src/pages/GoodsManage/createModal/index.jsx

@@ -448,10 +448,26 @@ class goodsManage extends Component {
   };
 
   render() {
-    const { visible, form, initData = {}, treeData, virtualTreeData } = this.props;
+    // specListData
+    const { visible, form, initData = {}, treeData, virtualTreeData, specListData } = this.props;
+    // const specListData = [{
+    //   "specName": "服务",
+    //   "specId":"services",
+    //   "specValues": [
+    //       {
+    //           "value": 1,
+    //           "label": "七天无理由退货"
+    //       },
+    //       {
+    //           "value": 2,
+    //           "label": "2222"
+    //       }
+    //   ]
+    //   }
+    // ]
     const isEdit = Object.keys(initData).length !== 0;
     // 是否仅编辑卖点和服务
-    const isService = initData.state === 5;
+    const isService = initData.state !== 4;
     const { getFieldDecorator, getFieldsValue } = form;
     getFieldDecorator('firstKeys', { initialValue: [] });
     getFieldDecorator('secondKeys', { initialValue: [] });
@@ -492,6 +508,12 @@ class goodsManage extends Component {
     if (isEdit && !initData.editData[0]?.firstSpec && !initData.editData[0]?.secondSpec) {
       colorKeys = colorKeys.length > 1 ? colorKeys.filter(item => item !== 'null') : colorKeys;
     }
+    const optionsWithDisabled = [
+      { label: 'Apple', value: 'Apple' },
+      { label: 'Pear', value: 'Pear' },
+      { label: 'Orange', value: 'Orange', disabled: false },
+    ];
+
     return (
       <Modal
         title={initData.id ? '修改商品' : '新增商品'}
@@ -511,7 +533,7 @@ class goodsManage extends Component {
                       initialValue: productType,
                       rules: [{ required: true, message: '请选择商品类型' }],
                     })(
-                      <Radio.Group disabled={isEdit} onChange={this.bundleRadioChange}>
+                      <Radio.Group disabled={isEdit || isService} onChange={this.bundleRadioChange}>
                         {productTypeList.map(item => (
                           <Radio key={item.value} value={item.value} disabled={item.disabled}>
                             {item.label}
@@ -621,24 +643,27 @@ class goodsManage extends Component {
                 <Col span={24}>
                   <FormItem label="商品卖点" labelCol={{ span: 2 }}>
                     {getFieldDecorator('name', {
-                      initialValue: initData.name,
+                      initialValue: initData.character,
                     })(
                       <Input
                         style={{ width: 690 }}
-                        maxLength="50"
+                        maxLength={50}
                         placeholder="好的卖点信息有利于提高商品转化，限50字"
                         allowClear
                       />,
                     )}
                   </FormItem>
                 </Col>
-                <Col span={24}>
-                  <FormItem label="商品服务" labelCol={{ span: 2 }}>
-                    {getFieldDecorator('name', {
-                      initialValue: initData.name,
-                    })(<Checkbox>七天无理由退货</Checkbox>)}
-                  </FormItem>
-                </Col>
+                {specListData.length &&
+                  specListData.map((item, index) => (
+                    <Col span={24}>
+                      <FormItem label={item.specName} labelCol={{ span: 2 }}>
+                        {getFieldDecorator(`${item.specId}`, {
+                          initialValue: `initData.${item.specId}`,
+                        })(<Checkbox.Group options={item.specValues} />)}
+                      </FormItem>
+                    </Col>
+                  ))}
               </Row>
             </Card>
             <Card className={styles.card} bordered={false}>
@@ -652,7 +677,7 @@ class goodsManage extends Component {
                       showSearch
                       style={{ width: 200 }}
                       placeholder="请选择一级规格"
-                      disabled={isEdit && initData.firstSpecId}
+                      disabled={(isEdit && initData.firstSpecId) || isService}
                       onChange={(val, option) =>
                         this.specChange('first', option?.props.children, val)
                       }
@@ -730,7 +755,7 @@ class goodsManage extends Component {
                     <Select
                       allowClear
                       showSearch
-                      disabled={isEdit && initData.secondSpecId}
+                      disabled={(isEdit && initData.secondSpecId) || isService}
                       placeholder="请选择二级规格"
                       style={{ width: 200 }}
                       onChange={(val, option) => this.specChange('second', option?.props.children)}

src/pages/GoodsManage/index.jsx

@@ -3,12 +3,13 @@ import React, { Component } from 'react';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { connect } from 'dva';
 import { sortBy } from 'lodash';
+import { da } from 'date-fns/locale';
 import styles from './style.less';
 import LocalStroage from '@/utils/localStorage';
 import configApi from '../../../config/env.config';
 import UpdateStock from './UpdateStock';
 
-import { spuDetail, categoryList, getVirtualCategory } from './service';
+import { spuDetail, categoryList, getVirtualCategory, specList } from './service';
 import LogModal from './LogModal';
 import CreateModal from './createModal';
 import { column, JDSHOPID } from './staticdata';
@@ -27,11 +28,12 @@ class goodsManage extends Component {
     priceInfo: {},
     logVisible: false,
     previewVisible: false,
-    createVisible: true, // 新增or编辑普通商品modal
+    createVisible: false, // 新增or编辑普通商品modal
     selectedRowKeys: [],
     updateStockVisible: false,
     initData: {},
     createloading: false,
+    specListData: [],
   };
 
   currentLog = null;
@@ -44,6 +46,7 @@ class goodsManage extends Component {
     this.props.goodsManage.tableData = {};
     this.categoryList();
     this.getVirtualCategory();
+    this.specList();
   }
 
   handleSearch = page => {
@@ -104,7 +107,7 @@ class goodsManage extends Component {
     });
     const { data, msg } = await spuDetail({ id: spuId });
     if (data) {
-      data.state = 5;
+      data.state = state;
       data.pageProductType = productType;
       data.categoryId = data.thirdCategoryId;
       data.firstSpecId = data.skuList[0].firstSpecId;
@@ -236,6 +239,13 @@ class goodsManage extends Component {
     }
   };
 
+  specList = async () => {
+    const data = await specList();
+    if (data.code === '0000' && data.data.length) {
+      this.setState({ specListData: data.data });
+    }
+  };
+
   render() {
     const {
       goodsManage: { tableData = {} },
@@ -319,6 +329,7 @@ class goodsManage extends Component {
             shopList={this.filterShopList(this.shopList, Object.keys(this.state.initData).length)}
             treeData={this.state.treeData}
             virtualTreeData={this.state.virtualTreeData}
+            specListData={this.state.specListData}
           ></CreateModal>
 
           <UpdateStock

src/pages/GoodsManage/service.js

@@ -148,3 +148,13 @@ export async function getVirtualCategory() {
   });
   return data;
 }
+
+// 查询商品属性列表
+export async function specList() {
+  // return request.get('/mock/389/product/spec', {
+  //   prefix: 'http://yapi.quantgroups.com',
+  // })
+  return request.get('/product/api/merchant/spec', {
+    prefix: goodsApi,
+  });
+}

src/pages/GoodsManage/staticdata.js

@@ -132,7 +132,7 @@ export function column() {
       render: (_, row) => (
         <div>
           <p>{row.state >= 5 ? '审核通过' : _}</p>
-          <p>信息变更待审核</p>
+          <p>{row.updateState || '_ _'}</p>
         </div>
       ),
     },
@@ -143,7 +143,7 @@ export function column() {
       align: 'center',
       render: (_, row) => (
         <div className={styles.actionBtn}>
-          {(row.state === 4 || row.state === 5) && (
+          {(row.state === 4 || (row.state === 5 && row.updateState !== 1)) && (
             <Button
               key="edit"
               type="primary"