Merge branch 'feature/goodsChange' into 'master'

Feature/goods change

See merge request !29

config/env.config.js

@@ -2,14 +2,14 @@ const isProduction = process.env.NODE_ENV === 'production';
 const isPre = process.env.PRE_ENV === 'pre';
 
 const envAPi = {
-  api: '//backstms-test2.liangkebang.net',
-  kdspOpApi: 'https://kdsp-operation-test2.liangkebang.net',
-  kdspApi: 'https://sc-op-api-test2.liangkebang.net',
-  goodsApi: 'https://sc-op-api-test2.liangkebang.net',
-  // goodsApi: '//192.168.188.111:7000',
-  prologueDomain: 'https://mall-test2.liangkebang.net',
+  api: '//backstms-gyl2.liangkebang.net',
+  kdspOpApi: 'https://kdsp-operation-gyl2.liangkebang.net',
+  kdspApi: 'https://sc-op-api-gyl2.liangkebang.net',
+  goodsApi: 'https://sc-op-api-gyl2.liangkebang.net',
+  // goodsApi: '//192.168.28.107:7000',
+  prologueDomain: 'https://mall-gyl2.liangkebang.net',
   qiniuHost: 'https://appsync.lkbang.net',
-  opapiHost: 'https://opapi-test2.liangkebang.net',
+  opapiHost: 'https://opapi-gyl2.liangkebang.net',
 };
 
 const prodApi = {

src/pages/GoodsManage/createModal/batchSetting.jsx

@@ -81,6 +81,7 @@ class goodsManage extends Component {
       secondSpesName = '',
       productType,
       isEdit,
+      isService,
     } = this.props;
     const { getFieldDecorator } = this.props.form;
     return (
@@ -171,7 +172,7 @@ class goodsManage extends Component {
           </FormItem>
         )}
         <FormItem>
-          <Button type="primary" htmlType="submit" onClick={this.batchSetting}>
+          <Button type="primary" htmlType="submit" onClick={this.batchSetting} disabled={isService}>
             批量设置
           </Button>
         </FormItem>

src/pages/GoodsManage/createModal/index.jsx

@@ -333,11 +333,11 @@ class goodsManage extends Component {
     const {
       form: { validateFields },
       initData,
+      specListData,
     } = this.props;
     const { editData, productType } = this.state;
 
     validateFields(async (errors, values) => {
-      console.log(values);
       let imgErr = false;
       if (!errors) {
         if (validateSpuInfo(values, initData, editData, productType)) return;
@@ -357,6 +357,15 @@ class goodsManage extends Component {
           notification.error({ message: '滑动图不全，请检查！' });
           return;
         }
+        const specs = [];
+        specListData.forEach(item => {
+          if (values.hasOwnProperty(item.specId)) {
+            specs.push({
+              specId: item.specId,
+              specValues: values[item.specId] || [],
+            });
+          }
+        });
         await this.setState(prev => ({
           confirmLoading: true,
           createData: {
@@ -370,6 +379,8 @@ class goodsManage extends Component {
             categoryId: prev.categoryId ? prev.categoryId : initData?.thirdCategoryId,
             // productType: values.productType,
             type: values.productType,
+            specs,
+            character: values.character,
           },
         }));
         const data = initData.id
@@ -448,8 +459,10 @@ class goodsManage extends Component {
   };
 
   render() {
-    const { visible, form, initData = {}, treeData, virtualTreeData } = this.props;
+    const { visible, form, initData = {}, treeData, virtualTreeData, specListData } = this.props;
     const isEdit = Object.keys(initData).length !== 0;
+    // 是否仅编辑卖点和服务
+    const isService = initData.state && initData.state !== 4;
     const { getFieldDecorator, getFieldsValue } = form;
     getFieldDecorator('firstKeys', { initialValue: [] });
     getFieldDecorator('secondKeys', { initialValue: [] });
@@ -459,7 +472,7 @@ class goodsManage extends Component {
     if (isFirstSame) first.pop();
     if (isSecondSame) second.pop();
     let colorKeys = isEdit
-      ? initData.firstSpecList.concat(first || this.state.initForm.first || [])
+      ? initData?.firstSpecList?.concat(first || this.state.initForm.first || [])
       : first || this.state.initForm.first || [];
 
     if (isEdit && !Object.keys(this.state.initForm).length && !this.state.isCancel) {
@@ -490,6 +503,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 ? '修改商品' : '新增商品'}
@@ -509,7 +528,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}
@@ -538,7 +557,7 @@ class goodsManage extends Component {
                         fieldNames={{ label: 'name', value: 'id', children: 'children' }}
                         options={treeDataArray}
                         onChange={(val, label, ext) => this.treeChange(val, label, ext)}
-                        // disabled={isEdit}
+                        disabled={isService}
                       />,
                     )}
                   </FormItem>
@@ -567,6 +586,7 @@ class goodsManage extends Component {
                         style={{ width: 280 }}
                         filterOption={filterOption}
                         placeholder="请选择商品品牌，支持模糊搜索"
+                        disabled={isService}
                       >
                         {brandListArray?.length &&
                           brandListArray.map(item => (
@@ -604,6 +624,7 @@ class goodsManage extends Component {
                           maxLength={100}
                           placeholder="请输入商品名称"
                           allowClear
+                          disabled={isService}
                         />,
                       )}
                     </FormItem>
@@ -614,6 +635,31 @@ class goodsManage extends Component {
                     </div>
                   )}
                 </Col>
+                <Col span={24}>
+                  <FormItem label="商品卖点" labelCol={{ span: 2 }}>
+                    {getFieldDecorator('character', {
+                      initialValue: initData.character,
+                    })(
+                      <Input
+                        style={{ width: 690 }}
+                        maxLength={50}
+                        placeholder="好的卖点信息有利于提高商品转化，限50字"
+                        allowClear
+                      />,
+                    )}
+                  </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}>
@@ -627,7 +673,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)
                       }
@@ -705,7 +751,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)}
@@ -767,6 +813,7 @@ class goodsManage extends Component {
                 type="primary"
                 className={styles.logBtn}
                 onClick={() => this.createShopInfo(isEdit)}
+                disabled={isService}
               >
                 生成商品信息
               </Button>
@@ -784,6 +831,7 @@ class goodsManage extends Component {
               productType={productType}
               isEdit={isEdit}
               isJDGoods={isJDGoods}
+              isService={isService}
             />
             <Row>
               <Table
@@ -804,6 +852,7 @@ class goodsManage extends Component {
                   this.state.initForm.secondSpecName,
                   isJDGoods,
                   isEdit,
+                  isService,
                 )}
               />
             </Row>
@@ -814,6 +863,7 @@ class goodsManage extends Component {
                 onClick={this.deleteImg}
                 style={{ marginTop: '10px' }}
                 icon="rest"
+                disabled={isService}
               >
                 图片批量删除
               </Button>
@@ -832,7 +882,7 @@ class goodsManage extends Component {
                       initialValue: this.state.initForm.commonImageList,
                       valuePropName: 'fileList',
                       getValueFromEvent: normFile,
-                    })(<Upload />)}
+                    })(<Upload isDisabled={isService} />)}
                   </FormItem>
                 </Col>
               </Row>
@@ -840,7 +890,6 @@ class goodsManage extends Component {
                 colorKeys.map(color => {
                   if (JSON.stringify(color) === '{}') return [];
                   if ((color !== null && !color) || (color && !color.trim())) return [];
-                  // if (initData.) {}
                   return [
                     <Row>
                       <Col span={1}>
@@ -861,7 +910,12 @@ class goodsManage extends Component {
                               this.state.initForm.imageList && this.state.initForm.imageList[color],
                             valuePropName: 'fileList',
                             getValueFromEvent: normFile,
-                          })(<Upload onChange={val => this.imgChange(val, color)} />)}
+                          })(
+                            <Upload
+                              isDisabled={isService}
+                              onChange={val => this.imgChange(val, color)}
+                            />,
+                          )}
                           <Button
                             disabled={colorImg[color]?.length}
                             size="small"
@@ -898,7 +952,7 @@ class goodsManage extends Component {
                         message: '请上传详情图',
                       },
                     ],
-                  })(<Upload />)}
+                  })(<Upload isDisabled={isService} />)}
                 </FormItem>
               </Col>
             </Row>

src/pages/GoodsManage/createModal/mixin.jsx

@@ -213,7 +213,15 @@ export function verify(initData, categoryId) {
   return false;
 }
 
-export function editColumns(methods, firstData, firstSpec, secondSpec, isJDGoods, isEdit) {
+export function editColumns(
+  methods,
+  firstData,
+  firstSpec,
+  secondSpec,
+  isJDGoods,
+  isEdit,
+  isService,
+) {
   const { getJdPicList, inputChange, openModal, productType } = methods;
   if (!firstData) return [];
 
@@ -231,7 +239,7 @@ export function editColumns(methods, firstData, firstSpec, secondSpec, isJDGoods
           precision={2}
           min={0}
           onChange={value => inputChange(value, 'supplyPrice', index)}
-          disabled={isJDGoods}
+          disabled={isJDGoods || isService}
         />
       ),
     },
@@ -248,6 +256,7 @@ export function editColumns(methods, firstData, firstSpec, secondSpec, isJDGoods
           precision={2}
           min={0}
           onChange={value => inputChange(value, 'marketPrice', index)}
+          disabled={isService}
         />
       ),
     },
@@ -263,6 +272,7 @@ export function editColumns(methods, firstData, firstSpec, secondSpec, isJDGoods
           precision={0}
           min={0}
           onChange={value => inputChange(value, 'productStock', index)}
+          disabled={isService}
         />
       ),
     },
@@ -278,6 +288,7 @@ export function editColumns(methods, firstData, firstSpec, secondSpec, isJDGoods
           className={`thirdSkuNo ${index}`}
           defaultValue={val}
           onChange={evt => inputChange(evt.target.value, 'thirdSkuNo', index)}
+          disabled={isService}
         />
       ),
     },
@@ -295,6 +306,7 @@ export function editColumns(methods, firstData, firstSpec, secondSpec, isJDGoods
               className={`skuLink ${index}`}
               defaultValue={val}
               onChange={evt => inputChange(evt.target.value, 'skuLink', index)}
+              disabled={isService}
             />
           }
         </Popover>
@@ -319,6 +331,7 @@ export function editColumns(methods, firstData, firstSpec, secondSpec, isJDGoods
               size="small"
               style={{ marginTop: '5px' }}
               onClick={() => openModal(row, index)}
+              disabled={isService}
             >
               修改sku名称
             </Button>
@@ -343,6 +356,7 @@ export function editColumns(methods, firstData, firstSpec, secondSpec, isJDGoods
           max={999999.999}
           precision={3}
           onChange={value => inputChange(value, 'weight', index)}
+          disabled={isService}
         />
       ),
     });
@@ -360,6 +374,7 @@ export function editColumns(methods, firstData, firstSpec, secondSpec, isJDGoods
           min={0}
           precision={0}
           onChange={value => inputChange(value, 'productStockWarning', index)}
+          disabled={isService}
         />
       ),
     });

src/pages/GoodsManage/index.jsx

@@ -3,11 +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, getTemplateList } from './service';
+
+import { spuDetail, categoryList, getVirtualCategory, getTemplateList, specList } from './service';
 import LogModal from './LogModal';
 import CreateModal from './createModal';
 import { column, JDSHOPID } from './staticdata';
@@ -31,6 +33,7 @@ class goodsManage extends Component {
     updateStockVisible: false,
     initData: {},
     createloading: false,
+    specListData: [],
     templeatModalVisible: false,
     selectedRowKeys: [],
     isAll: 0,
@@ -47,6 +50,7 @@ class goodsManage extends Component {
     this.props.goodsManage.tableData = {};
     this.categoryList();
     this.getVirtualCategory();
+    this.specList();
   }
 
   handleSearch = page => {
@@ -97,12 +101,13 @@ class goodsManage extends Component {
     this.handleSearch();
   };
 
-  onUpdateInfo = async ({ spuId, productType }) => {
+  onUpdateInfo = async ({ state, spuId, productType }) => {
     this.setState({
       createloading: true,
     });
     const { data, msg } = await spuDetail({ id: spuId });
     if (data) {
+      data.state = state;
       data.pageProductType = productType;
       data.categoryId = data.thirdCategoryId;
       data.firstSpecId = data.skuList[0].firstSpecId;
@@ -125,7 +130,15 @@ class goodsManage extends Component {
           data.secondSpecList.push(i.secondSpecValue);
         }
       });
-
+      data.specs.forEach(item => {
+        const arr = [];
+        if (item.specValues.length) {
+          item.specValues.forEach(childItem => {
+            arr.push(childItem.value);
+          });
+        }
+        data[item.specId] = arr;
+      });
       data.imageList = [];
       data.carouseList.forEach(i => {
         data.imageList[`${i.specValue}`] = i.skuSpecImageList || [];
@@ -251,6 +264,13 @@ class goodsManage extends Component {
     }
   };
 
+  specList = async () => {
+    const data = await specList();
+    if (data.businessCode === '0000' && data.data.length) {
+      this.setState({ specListData: data.data });
+    }
+  };
+
   onSelectChange = selectedRowKeys => {
     this.setState({
       selectedRowKeys,
@@ -346,6 +366,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,6 +148,13 @@ export async function getVirtualCategory() {
   });
   return data;
 }
+
+// 查询商品属性列表
+export async function specList() {
+  return request.get('/product/api/merchant/spec', {
+    prefix: goodsApi,
+  });
+}
 // sku绑定模板
 export async function getTemplate(params) {
   const data = await request.post('/api/kdsp/sku/template', {

src/pages/GoodsManage/staticdata.js

@@ -137,7 +137,12 @@ export function column() {
       dataIndex: 'stateDesc',
       width: 200,
       align: 'center',
-      render: (_, row) => <span>{row.state >= 5 ? '审核通过' : _}</span>,
+      render: (_, row) => (
+        <div>
+          <p>{row.state >= 5 ? '审核通过' : _}</p>
+          <p>{row.updateStateDesc || '_ _'}</p>
+        </div>
+      ),
     },
     {
       title: '操作',
@@ -146,7 +151,7 @@ export function column() {
       align: 'center',
       render: (_, row) => (
         <div className={styles.actionBtn}>
-          {row.state === 4 && (
+          {(row.state === 4 || (row.state === 5 && row.updateState !== 1)) && (
             <Button
               key="edit"
               type="primary"

src/pages/GoodsManage/style.less

@@ -85,6 +85,7 @@
 }
 .warning {
   margin-top: -20px;
+  margin-bottom: 20px;
   color: red;
 }
 

src/pages/components/sortablUpload/index.jsx

@@ -156,7 +156,7 @@ class PicturesWall extends React.Component {
         <div className="ant-upload-text">上传图片</div>
       </div>
     );
-    const { max } = this.props;
+    const { max, isDisabled } = this.props;
     const that = this;
     const uploadProps = {
       beforeUpload: lodash.debounce(async (file, files) => {
@@ -218,11 +218,13 @@ class PicturesWall extends React.Component {
                         className={styles.maskIcon}
                         onClick={() => this.handlePreview(item)}
                       />
-                      <Icon
-                        type="delete"
-                        className={styles.maskIcon}
-                        onClick={() => this.onRemoveImg(item)}
-                      />
+                      {!isDisabled && (
+                        <Icon
+                          type="delete"
+                          className={styles.maskIcon}
+                          onClick={() => this.onRemoveImg(item)}
+                        />
+                      )}
                     </div>
                   )}
                 </div>
@@ -230,7 +232,13 @@ class PicturesWall extends React.Component {
             </ReactSortable>
           )}
         </div>
-        <Upload multiple {...uploadProps} fileList={fileList} showUploadList={false}>
+        <Upload
+          multiple
+          {...uploadProps}
+          fileList={fileList}
+          showUploadList={false}
+          disabled={isDisabled}
+        >
           {max && fileList.length >= max ? null : uploadButton}
         </Upload>
         <Modal visible={previewVisible} footer={null} onCancel={this.handleCancel}>