add package manage module;

src/common/router.js

@@ -126,17 +126,21 @@ export const getRouterData = (app) => {
       name: '修改配套',
     },
     '/product/package': {
-      component: dynamicWrapper(app, ['combo/combo'], () => import('../routes/Combo')),
+      component: dynamicWrapper(app, ['combo/combo'], () => import('../routes/Combo/List')),
+    },
+    '/product/package/add': {
+      component: dynamicWrapper(app, ['combo/detail', 'product'], () => import('../routes/Combo/Edit')),
+      name: '创建课程包',
     },
     '/goods': {
-      component: dynamicWrapper(app, ['goods/goods', 'merchant/merchant'], () => import('../routes/Goods/List')),
+      component: dynamicWrapper(app, ['mproduct/mproduct', 'merchant/merchant'], () => import('../routes/MProduct/List')),
     },
     '/goods/add': {
-      component: dynamicWrapper(app, ['course/course', 'support/support', 'combo/combo', 'merchant/merchant', 'goods/detail'], () => import('../routes/Goods/Add')),
+      component: dynamicWrapper(app, ['course/course', 'support/support', 'combo/combo', 'merchant/merchant', 'mproduct/detail'], () => import('../routes/MProduct/Add')),
       name: '创建商品',
     },
     '/goods/edit': {
-      component: dynamicWrapper(app, ['goods/detail'], () => import('../routes/Goods/Edit')),
+      component: dynamicWrapper(app, ['mproduct/detail', 'goods', 'tag/tag'], () => import('../routes/MProduct/Edit')),
       name: '修改商品',
     },
     // '/goods/add': {

src/components/CardValuation/index.js

@@ -1,247 +0,0 @@
-import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
-import { Divider, Popconfirm, message, Button, Card, Table, Input } from 'antd';
-import styles from './index.less';
-
-export default class CardValuation extends PureComponent {
-  static propTypes = {
-    value: PropTypes.array.isRequired,
-    cardTitle: PropTypes.string,
-  };
-
-  constructor(props) {
-    super(props);
-
-    this.state = {
-      data: props.value,
-    }
-  }
-
-  componentWillReceiveProps(nextProps) {
-    if ('value' in nextProps) {
-      this.setState({
-        data: nextProps.value,
-      });
-    }
-  }
-
-  getRowByKey(key) {
-    return this.state.data.filter(item => item.key === key)[0];
-  }
-
-  index = 0;
-  cacheOriginData = {};
-  // 切换编辑状态
-  toggleEditable(e, key) {
-    e.preventDefault();
-    const target = getRowByKey(key);
-    if (target) {
-      // 进入编辑状态时缓存原始数据
-      if (!target.editable) {
-        this.cacheOriginData[key] = { ...target };
-      }
-      target.editable = !target.editable;
-      this.setState({ data: [...this.state.data] });
-    }
-  }
-
-  // 删除一行
-  remove(key) {
-    const newData = this.state.data.filter(item => item.key !== key);
-    this.setState({ data: newData });
-    this.props.onChange(newData);
-  }
-
-  // 表格新建一行
-  newMember = () => {
-    const newData = [...this.state.data];
-    newData.push({
-      key: `NEW_TEMP_ID_${this.index}`,
-      chargeUnit: '',
-      cpPrice: '',
-      merchantPrice: '',
-      terminalPrice: '',
-      editable: true,
-      isNew: true,
-    });
-    this.index += 1;
-    this.setState({ data: newData });
-  }
-
-  // 编辑状态，回车直接保存
-  handleKeyPress(e, key) {
-    if (e.key === 'Enter') {
-      this.saveRow(e, key);
-    }
-  }
-
-  // input输入值变化
-  handleFieldChange(e, fieldName, key) {
-    const newData = [...this.state.data];
-    const target = this.getRowByKey(key);
-    if (target) {
-      target[fieldName] = e.target.value;
-      this.setState({ data: newData });
-    }
-  }
-
-  // 保存
-  saveRow(e, key) {
-    e.persist();
-    // save field when blur input
-    setTimeout(() => {
-      if (document.activeElement.tagName === 'INPUT' &&
-          document.activeElement !== e.target) {
-        return;
-      }
-      if (this.clickedCancel) {
-        this.clickedCancel = false;
-        return;
-      }
-      const target = this.getRowByKey(key) || {};
-      // if (!target.chargeUnit || !target.terminalPrice || !target.department) {
-      //   message.error('请填写完整成员信息。');
-      //   e.target.focus();
-      //   return;
-      // }
-      delete target.isNew;
-      this.toggleEditable(e, key);
-      this.props.onChange(this.state.data);
-    }, 10);
-  }
-
-  // 取消编辑
-  cancel(e, key) {
-    this.clickedCancel = true;
-    e.preventDefault();
-    const target = this.getRowByKey(key);
-    if (this.cacheOriginData[key]) {
-      Object.assign(target, this.cacheOriginData[key]);
-      target.editable = false;
-      delete this.cacheOriginData[key];
-    }
-    this.setState({ data: [...this.state.data] });
-  }
-
-  render() {
-    const { cardTitle } = this.props;
-    const columns = [{
-      title: '计价单位',
-      dataIndex: 'chargeUnit',
-      key: 'chargeUnit',
-      render: (text, record) => {
-        if (record.editable) {
-          return (
-            <Input
-              value={text}
-              autoFocus
-              placeholder="输入计价单位,如:`季`/`月/`年`/`件`等"
-            />
-          );
-        }
-        return text;
-      },
-    },{
-      title: '供应商价格(¥)',
-      dataIndex: 'cpPrice',
-      key: 'cpPrice',
-      render: (text, record) => {
-        if (record.editable) {
-          return (
-            <Input
-              value={text}
-              autoFocus
-              placeholder="请输入价格"
-            />
-          );
-        }
-        return text;
-      }
-    },{
-      title: '渠道方价格(¥)',
-      dataIndex: 'merchantPrice',
-      key: 'merchantPrice',
-      render: (text, record) => {
-        if (record.editable) {
-          return (
-            <Input
-              value={text}
-              autoFocus
-              placeholder="请输入渠道价格"
-            />
-          );
-        }
-        return text;
-      },
-    },{
-      title: '终端价格(¥)',
-      dataIndex: 'terminalPrice',
-      key: 'terminalPrice',
-      render: (text, record) => {
-        if (record.editable) {
-          return (
-            <Input
-              value={text}
-              autoFocus
-              placeholder="请输入终端价格"
-            />
-          );
-        }
-      }
-    },{
-      title: '操作',
-      key: 'action',
-      render: (text, record) => {
-        if (record.editable) {
-          if (record.isNew) {
-            return (
-              <span>
-                <a>保存</a>
-                <Divider type="vertical" />
-                <Popconfirm title="是否要删除此行？" onConfirm={() => this.remove(record.key)}>
-                  <a>删除</a>
-                </Popconfirm>
-              </span>
-            );
-          }
-          return (
-            <span>
-              <a>保存</a>
-              <Divider type="vertical" />
-              <a onClick={e => this.cancel(e, record.key)}>取消</a>
-            </span>
-          );
-        }
-        return (
-          <span>
-            <a onClick={e => this.toggleEditable(e, record.key)}>编辑</a>
-            <Divider type="vertical" />
-            <Popconfirm title="是否要删除此行？" onConfirm={() => this.remove(record.key)}>
-              <a>删除</a>
-            </Popconfirm>
-          </span>
-        );
-      }
-    }];
-    return (
-      <Card title={cardTitle} bordered={false}>
-        <Table
-          bordered={true}
-          columns={columns}
-          pagination={false}
-          dataSource={[]}
-          rowClassName={(record) => {
-            return record.editable ? styles.editable : '';
-          }}
-        />
-        <Button
-          onClick={this.newMember}
-          style={{ width: '100%', marginTop: 16, marginBottom: 8 }}
-          type="dashed"
-          icon="plus"
-        >新增价格类型
-        </Button>
-      </Card>
-    );
-  }
-}

src/components/CardValuation/index.less

@@ -1,8 +0,0 @@
-@import "~antd/lib/style/themes/default.less";
-
-.editable {
-  td {
-    padding-top: 13px !important;
-    padding-bottom: 12.5px !important;
-  }
-}

src/components/FooterToolbar/demo/basic.md

@@ -0,0 +1,36 @@
+---
+order: 0
+title: 演示
+iframe: 400
+---
+
+浮动固定页脚。
+
+````jsx
+import FooterToolbar from 'ant-design-pro/lib/FooterToolbar';
+import { Button } from 'antd';
+
+ReactDOM.render(
+  <div style={{ background: '#f7f7f7', padding: 24 }}>
+    <p>页面内容 页面内容 页面内容 页面内容</p>
+    <p>页面内容 页面内容 页面内容 页面内容</p>
+    <p>页面内容 页面内容 页面内容 页面内容</p>
+    <p>页面内容 页面内容 页面内容 页面内容</p>
+    <p>页面内容 页面内容 页面内容 页面内容</p>
+    <p>页面内容 页面内容 页面内容 页面内容</p>
+    <p>页面内容 页面内容 页面内容 页面内容</p>
+    <p>页面内容 页面内容 页面内容 页面内容</p>
+    <p>页面内容 页面内容 页面内容 页面内容</p>
+    <p>页面内容 页面内容 页面内容 页面内容</p>
+    <p>页面内容 页面内容 页面内容 页面内容</p>
+    <p>页面内容 页面内容 页面内容 页面内容</p>
+    <p>页面内容 页面内容 页面内容 页面内容</p>
+    <p>页面内容 页面内容 页面内容 页面内容</p>
+    <p>页面内容 页面内容 页面内容 页面内容</p>
+    <FooterToolbar extra="提示信息">
+      <Button>取消</Button>
+      <Button type="primary">提交</Button>
+    </FooterToolbar>
+  </div>
+, mountNode);
+````

src/components/FooterToolbar/index.d.ts

@@ -0,0 +1,10 @@
+import * as React from 'react';
+export interface FooterToolbarProps {
+  extra: React.ReactNode;
+  style?: React.CSSProperties;
+}
+
+export default class FooterToolbar extends React.Component<
+  FooterToolbarProps,
+  any
+> {}

src/components/FooterToolbar/index.js

@@ -0,0 +1,18 @@
+import React, { Component } from 'react';
+import classNames from 'classnames';
+import styles from './index.less';
+
+export default class FooterToolbar extends Component {
+  render() {
+    const { children, className, extra, ...restProps } = this.props;
+    return (
+      <div
+        className={classNames(className, styles.toolbar)}
+        {...restProps}
+      >
+        <div className={styles.left}>{extra}</div>
+        <div className={styles.right}>{children}</div>
+      </div>
+    );
+  }
+}

src/components/FooterToolbar/index.less

@@ -0,0 +1,33 @@
+@import "~antd/lib/style/themes/default.less";
+
+.toolbar {
+  position: fixed;
+  width: 100%;
+  bottom: 0;
+  right: 0;
+  height: 56px;
+  line-height: 56px;
+  box-shadow: 0 -1px 2px rgba(0, 0, 0, .03);
+  background: #fff;
+  border-top: 1px solid @border-color-split;
+  padding: 0 24px;
+  z-index: 9;
+
+  &:after {
+    content: "";
+    display: block;
+    clear: both;
+  }
+
+  .left {
+    float: left;
+  }
+
+  .right {
+    float: right;
+  }
+
+  button + button {
+    margin-left: 8px;
+  }
+}

src/components/FooterToolbar/index.md

@@ -0,0 +1,21 @@
+---
+title:
+  en-US: FooterToolbar
+  zh-CN: FooterToolbar
+subtitle: 底部工具栏
+cols: 1
+order: 6
+---
+
+固定在底部的工具栏。
+
+## 何时使用
+
+固定在内容区域的底部，不随滚动条移动，常用于长页面的数据搜集和提交工作。
+
+## API
+
+参数 | 说明 | 类型 | 默认值
+----|------|-----|------
+children | 工具栏内容，向右对齐 | ReactNode | -
+extra | 额外信息，向左对齐 | ReactNode | -

src/models/combo/detail.js

@@ -10,9 +10,8 @@ export default {
     filters: {},
     operType: 'create',
     currentItem: {},
-    courseModalVisible: false,
-    supportModalVisible: false,
     itemLoading: false,
+    modalShow: false,
   },
 
   subscriptions: {
@@ -72,34 +71,16 @@ export default {
       return { ...state, filters };
     },
 
-    showCourseModal(state, { payload }) {
-      return { ...state, ...payload, courseModalVisible: true };
-    },
-
-    hideCourseModal(state) {
-      return { ...state, courseModalVisible: false };
-    },
-
-    showSupportModal(state, { payload }) {
-      return { ...state, ...payload, supportModalVisible: true };
-    },
-
-    hideSupportModal(state) {
-      return { ...state, supportModalVisible: false };
-    },
-
     saveOperType(state, { payload }) {
       return { ...state, ...payload };
     },
 
-    saveCourseList(state, { payload: { courseList } }) {
-      const currentItem = { ...state.currentItem, courseList };
-      return { ...state, courseModalVisible: false, currentItem };
+    showModal(state, action) {
+      return { ...state, ...action.payload, modalShow: true };
     },
 
-    saveSupportList(state, { payload: { supportList } }) {
-      const currentItem = { ...state.currentItem, supportList };
-      return { ...state, supportModalVisible: false, currentItem };
+    hideModal(state, action) {
+      return { ...state, ...action.payload, modalShow: false };
     },
 
     clearPage(state) {

src/models/goods.js

@@ -0,0 +1,63 @@
+import { create, update, remove, bundleTags } from '../services/goods';
+import { message } from 'antd';
+import { Codes } from '../utils/config';
+
+export default {
+  namespace: 'goodsModel',
+
+  state: {
+    goodsItem: {},
+    modalShow: false,
+    tagModalShow: false,
+    operation: 'create',
+  },
+
+  effects: {
+    * createItem ({ payload, callback }, { call, put }) {
+      const { data, success } = yield call(create, { ...payload, status: Codes.CODE_NORMAL });
+      if (success) {
+        message.success('创建成功!');
+        yield put({ type: 'hideModal' });
+        if (callback) callback();
+      }
+    },
+    * updateItem ({ payload, callback }, { call, put }) {
+      const { data, success } = yield call(update, { ...payload });
+      if (success) {
+        message.success('修改成功!');
+        yield put({ type: 'hideModal' });
+        if (callback) callback();
+      }
+    },
+    * removeItem ({ payload, callback }, { call, put }) {
+      const { data, success } = yield call(remove, { ...payload });
+      if (success) {
+        message.success('删除成功!');
+        if (callback) callback();
+      }
+    },
+    * bundleTags ({ payload, callback }, { call, put }) {
+      const { data, success } = yield call(bundleTags, { ...payload });
+      if (success) {
+        message.success('操作成功!');
+        yield put({ type: 'hideTagModal' });
+        if (callback) callback();
+      }
+    }
+  },
+
+  reducers: {
+    showModal(state, action) {
+      return { ...state, ...action.payload, modalShow: true };
+    },
+    showTagModal(state, action) {
+      return { ...state, ...action.payload, tagModalShow: true };
+    },
+    hideModal(state, action) {
+      return { ...state, ...action.payload, modalShow: false };
+    },
+    hideTagModal(state, action) {
+      return { ...state, ...action.payload, tagModalShow: false };
+    },
+  },
+}

src/models/goods/detail.js

@@ -1,10 +1,10 @@
-import { queryOne, createMerchantProduct, update } from '../../services/goods';
+import { queryOne, createMerchantProduct } from '../../services/mproduct';
 import pathToRegexp from 'path-to-regexp';
 import queryString from 'query-string';
 import { Codes } from '../../utils/config';
 
 export default {
-  namespace: 'goodsDetail',
+  namespace: 'mproductDetail',
 
   state: {
     filters: {},
@@ -46,22 +46,6 @@ export default {
         if (callback) callback();
       }
     },
-    // 给产品挂载标签
-    * addTagsToMerchantProduct () {
-
-    },
-    // 定价过程 - 创建多个商品
-    * createGoods () {
-
-    },
-    // // 更新该产品，挂载标签/产品定价
-    // * updateItem ({ payload, callback }, { call, put }) {
-    //   const { data, success } = yield call(update, payload);
-    //   if (success) {
-    //     yield put({ type: 'clearPage' });
-    //     if (callback) callback();
-    //   }
-    // },
   },
 
   reducers: {

src/models/goods/goods.js

@@ -1,4 +1,4 @@
-import { query, update, createMerchantProduct } from '../../services/goods';
+import { query, update, createMerchantProduct } from '../../services/mproduct';
 import modelExtend from 'dva-model-extend';
 import queryString from 'query-string';
 import { message } from 'antd';
@@ -7,7 +7,7 @@ import { pageSize, Codes } from '../../utils/config';
 import { checkSearchParams } from '../../utils/utils';
 
 export default modelExtend(pageModel, {
-  namespace: 'goods',
+  namespace: 'mproduct',
 
   state: { listLoading: false },
 

src/models/product.js

@@ -0,0 +1,40 @@
+import { query } from '../services/product';
+import modelExtend from 'dva-model-extend';
+import queryString from 'query-string';
+import { pageModel } from './common';
+import { pageSize } from '../utils/config';
+import { checkSearchParams } from '../utils/utils';
+import { Codes } from '../utils/config';
+
+export default modelExtend(pageModel, {
+  namespace: 'product',
+
+  state: { listLoading: false },
+
+  effects: {
+    * query ({ payload = {} }, { call, put }) {
+      yield put({ type: 'changeLoading', payload: { listLoading: true }});
+      const { data, success } = yield call(query, payload);
+      if (success) {
+        yield put({
+          type: 'querySuccess',
+          payload: {
+            list: data.list,
+            pagination: {
+              current: Number(payload.pageNo) || 1,
+              pageSize: Number(payload.pageSize) || pageSize,
+              total: data.totalSize,
+            }
+          }
+        });
+      }
+      yield put({ type: 'changeLoading', payload: { listLoading: false }});
+    },
+  },
+
+  reducers: {
+    changeLoading(state, action) {
+      return { ...state, ...action.payload };
+    },
+  }
+})

src/models/tag/tag.js

@@ -7,7 +7,7 @@ import config from '../../utils/config';
 import { checkSearchParams } from '../../utils/utils';
 
 export default modelExtend(pageModel, {
-  namespace: 'tag',
+  namespace: 'tagModel',
 
   state: { listLoading: false },
 

src/routes/Combo/Edit/index.js

@@ -0,0 +1,138 @@
+import React, { PureComponent } from 'react';
+import { connect } from 'dva';
+import { routerRedux } from 'dva/router';
+import { Card, Table, Form, Spin, Input, Button, Icon } from 'antd';
+import PageHeaderLayout from '../../../layouts/PageHeaderLayout';
+import ProductSelectModal from './product';
+
+@Form.create()
+@connect(state => ({
+  comboDetail: state.comboDetail,
+  product: state.product,
+}))
+export default class PackageProfile extends PureComponent {
+
+  handleEditProuctClick = () => {
+    this.props.dispatch({ type: 'comboDetail/showModal' });
+    this.props.dispatch({ type: 'product/query' });
+  }
+
+  handleProductModalOk = () => {
+
+  }
+
+  handleProductModalCancel = () => {
+    this.props.dispatch({ type: 'comboDetail/hideModal' });
+  }
+
+  handleProductModalSearch = () => {
+
+  }
+
+  handleProductModalTableChange = () => {
+
+  }
+
+  render() {
+    const { form, comboDetail, product } = this.props;
+    const { modalShow, currentItem, itemLoading } = comboDetail;
+    const { list, listLoading, pagination } = product;
+    const { products } = currentItem;
+    const { getFieldDecorator } = form;
+
+    const formItemLayout = {
+      labelCol: { span: 7 },
+      wrapperCol: { span: 12 },
+    };
+
+    const submitFormLayout = {
+      wrapperCol: {
+        xs: { span: 24, offset: 0 },
+        sm: { span: 10, offset: 7 },
+      },
+    };
+
+    const tableFormLayout = {
+      wrapperCol: { offset: 7, span: 12 },
+    };
+
+    const columns = [{
+      title: '产品封面',
+      dataIndex: 'coverUrl',
+      key: 'coverUrl',
+      render: (text, record) => {},
+    },{
+      title: '产品编号',
+      dataIndex: 'code',
+      key: 'code',
+    },{
+      title: '产品名称',
+      dataIndex: 'name',
+      key: 'name',
+    },{
+      title: '供应商',
+      dataIndex: 'cpName',
+      key: 'cpName',
+    },{
+      title: '供应商价格',
+      dataIndex: 'cpPrice',
+      key: 'cpPrice',
+    }];
+
+    return (
+      <PageHeaderLayout>
+        <Spin spinning={itemLoading}>
+          <Card>
+            <Form layout="horizontal">
+              <Form.Item label="产品包编号" { ...formItemLayout }>
+                {getFieldDecorator('code', {
+                  rules: [{ required: true, type: 'string', message: '编号为必填项!' }],
+                })(<Input placeholder="请输入" />)}
+              </Form.Item>
+              <Form.Item label="产品包名称" { ...formItemLayout }>
+                {getFieldDecorator('name', {
+                  rules: [{ required: true, type: 'string', message: '名称为必填项!' }],
+                })(<Input placeholder="请输入" />)}
+              </Form.Item>
+              <Form.Item label="选择产品" { ...formItemLayout }>
+                <Button onClick={this.handleEditProuctClick} type="primary" size="small" icon="select">选择</Button>
+              </Form.Item>
+              <Form.Item { ...tableFormLayout }>
+                <Table
+                  simple
+                  bordered
+                  columns={columns}
+                  dataSource={[]}
+                  pagination={false}
+                  rowKey={record => record.id}
+                  locale={{
+                    emptyText: <span style={{ color: "#C6D0D6" }}>&nbsp;&nbsp;<Icon type="frown-o"/>
+                      该产品包内暂无相关产品，请选择!</span>
+                  }}
+                />
+              </Form.Item>
+              <Form.Item { ...submitFormLayout } style={{ marginTop: 32 }}>
+                <Button onClick={this.handlePageCancel}>取消</Button>
+                <Button type="primary" style={{ marginLeft: 35 }} htmlType="submit">提交</Button>
+              </Form.Item>
+            </Form>
+            {/*产品选择模态框*/}
+            <ProductSelectModal
+              rowKeyName="id"
+              modalVisible={modalShow}
+              selTableData={products || []}
+              style={{ top: 20 }}
+              fsTableDataSource={list}
+              fsTableLoading={listLoading}
+              fsTablePagination={pagination}
+              onOk={this.handleProductModalOk}
+              onCancel={this.handleProductModalCancel}
+              onSearch={this.handleProductModalSearch}
+              fsTableOnChange={this.handleProductModalTableChange}
+            />
+          </Card>
+        </Spin>
+      </PageHeaderLayout>
+    );
+  }
+}

src/routes/Combo/Edit/product.js

@@ -0,0 +1,125 @@
+import React, { PureComponent } from 'react';
+import PropTypes from 'prop-types';
+import { InputNumber } from 'antd';
+import SelectModal from '../../../components/SelectModal';
+import { Codes } from '../../../utils/config';
+
+export default class ProductSelectModal extends PureComponent {
+
+  render() {
+    const {
+      rowKeyName,
+      selTableData,
+      modalVisible,
+      onCancel,
+      onOk,
+      onSearch,
+      ...fsTableOpts
+    } = this.props;
+
+    const modalProps = {
+      title: '选择产品',
+      maskClosable: false,
+      visible: modalVisible,
+      onCancel,
+      onOk,
+    };
+
+    const searchProps = {
+      searchField: 'name',
+      searchKeyWord: '',
+      searchSize: 'default',
+      searchSelect: true,
+      searchSelectOptions: [{
+        value: 'name', name: '产品名称', mode: 'input',
+      },{
+        value: 'code', name: '产品编号', mode: 'input',
+      }],
+      searchSelectProps: {
+        defaultValue: 'name',
+      },
+      onSearch: (value) => {
+        onSearch(value);
+      },
+    };
+
+    //已选资源列表
+    const selTableProps = {
+      operDel: true,
+      tablePagination: false,
+      tableDataSource: selTableData,
+      rowKeyName: rowKeyName,
+      tableColumns: [{
+        title: '封面图片',
+        dataIndex: 'coverUrl',
+        key: 'coverUrl',
+        width: '18%'
+      },{
+        title: '产品编号',
+        dataIndex: 'code',
+        key: 'code',
+        width: '18%%',
+      },{
+        title: '产品名称',
+        dataIndex: 'name',
+        key: 'name',
+        width: '18%',
+      },{
+        title: '供应商',
+        dataIndex: 'cpName',
+        key: 'cpName',
+        width: '18%',
+      },{
+        title: '定价',
+        dataIndex: 'cpPrice',
+        key: 'cpPrice',
+        width: '16%',
+        render: (text, record) => (
+          <InputNumber
+            min={0}
+            value={record.cpPrice}
+            onChange={(value) => {record.cpPrice = value}}
+            formatter={value => `¥ ${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')}
+            parser={value => value.replace(/\¥\s?|(,*)/g, '')}
+          />
+        ),
+      }]
+    };
+
+    //待选资源Table属性
+    const fsTableProps = {
+      fsTableColumns: [{
+        title: '封面图片',
+        dataIndex: 'coverUrl',
+        key: 'coverUrl',
+        width: '22%'
+      },{
+        title: '产品编号',
+        dataIndex: 'code',
+        key: 'code',
+        width: '22%%',
+      },{
+        title: '产品名称',
+        dataIndex: 'name',
+        key: 'name',
+        width: '22%',
+      },{
+        title: '供应商',
+        dataIndex: 'cpName',
+        key: 'cpName',
+        width: '22%',
+      }],
+      ...fsTableOpts,
+    }
+
+    return (
+      <SelectModal
+        mode="multiple"
+        { ...searchProps }
+        { ...selTableProps }
+        { ...fsTableProps }
+        { ...modalProps }
+      />
+    );
+  }
+}

src/routes/Combo/index.js

@@ -6,8 +6,8 @@ import { routerRedux } from 'dva/router';
 import { Card } from 'antd';
 import TableList from './table';
 import Search from './search';
-import PageHeaderLayout from '../../layouts/PageHeaderLayout';
-import { Codes } from '../../utils/config';
+import PageHeaderLayout from '../../../layouts/PageHeaderLayout';
+import { Codes } from '../../../utils/config';
 
 @connect(state => ({
   combo: state.combo,

src/routes/Combo/search.js

@@ -1,7 +1,7 @@
 import react, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
 import { Button, Form, Row, Col, Icon } from 'antd';
-import DataSearch from '../../components/DataSearch';
+import DataSearch from '../../../components/DataSearch';
 
 @Form.create()
 export default class Search extends PureComponent {

src/routes/Combo/table.js

@@ -4,9 +4,9 @@ import moment from 'moment';
 import classnames from 'classnames';
 import queryString from 'query-string';
 import { Modal, Table, Menu, Icon, Badge } from 'antd';
-import AnimTableBody from '../../components/Animation/AnimTableBody';
+import AnimTableBody from '../../../components/Animation/AnimTableBody';
 import styles from './table.less';
-import { statuses, Codes } from '../../utils/config';
+import { statuses, Codes } from '../../../utils/config';
 
 const confirm = Modal.confirm;
 

src/routes/Combo/table.less

@@ -1,5 +1,5 @@
 @import "~antd/lib/style/themes/default.less";
-@import "../../utils/utils.less";
+@import "../../../utils/utils.less";
 
 .table {
   :global {

src/routes/Course/Edit/index.js

@@ -12,7 +12,6 @@ import { Codes } from '../../../utils/config';
 
 const FormItem = Form.Item;
 const Option = Select.Option;
-const { Meta } = Card;
 const { TextArea } = Input;
 
 @Form.create()

src/routes/Goods/Edit/index.js

@@ -1,40 +0,0 @@
-import React, { Component } from 'react';
-import { Card, Select } from 'antd';
-import { connect } from 'dva';
-import PageHeaderLayout from '../../../layouts/PageHeaderLayout';
-import DescriptionList from '../../../components/DescriptionList';
-import CardValuation from '../../../components/CardValuation';
-
-const { Description } = DescriptionList;
-
-@connect(state => ({ goodsDetail: state.goodsDetail}))
-export default class GoodsEdit extends Component {
-  render(){
-    return (
-      <PageHeaderLayout>
-        <Card
-          bordered={false}
-          title="商品详情"
-          style={{ marginBottom: 15 }}
-        >
-          <DescriptionList size="large" style={{ marginBottom: 32 }}>
-            <Description term="产品编号">{"COURSE-math-001"}</Description>
-            <Description term="产品名称">小学一年级数学</Description>
-            <Description term="产品类型">课程</Description>
-          </DescriptionList>
-        </Card>
-        <Card
-          bordered={false}
-          title="标签"
-          style={{ marginBottom: 15 }}
-        >
-          <Select style={{ width: 200 }}></Select>
-        </Card>
-        <CardValuation
-          cardTitle="商品定价"
-          value={[]}
-        />
-      </PageHeaderLayout>
-    );
-  }
-}

src/routes/Goods/Add/index.js

@@ -23,9 +23,9 @@ const { TextArea } = Input;
   support: state.support,
   combo: state.combo,
   merchant: state.merchant,
-  goodsDetail: state.goodsDetail,
+  mproductDetail: state.mproductDetail,
 }))
-export default class GoodsAdd extends PureComponent {
+export default class MerchantProductCreate extends PureComponent {
   state = {
     radioType: Codes.CODE_COURSE,
     curClickedBtn: null,
@@ -152,7 +152,7 @@ export default class GoodsAdd extends PureComponent {
     }
   }
 
-  handleModalTableChange = () => {
+  handleModalTableChange = (pagination, filterArgs) => {
     const { curClickedBtn } = this.state;
     const { dispatch } = this.props;
     const newFilters = { ...filters };
@@ -191,7 +191,7 @@ export default class GoodsAdd extends PureComponent {
         getFieldsValue,
         resetFields,
       },
-      goodsDetail: {
+      mproductDetail: {
         filters,
       }
     } = this.props;
@@ -207,7 +207,7 @@ export default class GoodsAdd extends PureComponent {
       };
       data.status ? data.status = Codes.CODE_NORMAL : data.status = Codes.CODE_DELETE;
       dispatch({
-        type: `goodsDetail/createMerchantProduct`,
+        type: `mproductDetail/createMerchantProduct`,
         payload: data,
         callback: () => {
           dispatch(
@@ -223,7 +223,7 @@ export default class GoodsAdd extends PureComponent {
   }
 
   handlePageCancel = () => {
-    const { dispatch, goodsDetail: { filters } } = this.props;
+    const { dispatch, mproductDetail: { filters } } = this.props;
     dispatch(
       routerRedux.push({
         pathname: '/goods',

src/routes/MProduct/Edit/index.js

@@ -0,0 +1,287 @@
+import React, { PureComponent } from 'react';
+import { Divider, Modal, Table, Form, Card, Button, Tag } from 'antd';
+import { connect } from 'dva';
+import { routerRedux } from 'dva/router';
+import queryString from 'query-string';
+import PageHeaderLayout from '../../../layouts/PageHeaderLayout';
+import FooterToolbar from '../../../components/FooterToolbar';
+import DescriptionList from '../../../components/DescriptionList';
+import NewPriceModal from './price';
+import TagSelectModal from './tags';
+import { pageSize, productType, Codes } from '../../../utils/config';
+
+const { Description } = DescriptionList;
+const confirm = Modal.confirm;
+
+@Form.create()
+@connect(state => ({
+  mproductDetail: state.mproductDetail,
+  goodsModel: state.goodsModel,
+  tagModel: state.tagModel,
+}))
+export default class MerchantProductEdit extends PureComponent {
+
+  handleAddPriceClick = () => {
+    this.props.dispatch({
+      type: 'goodsModel/showModal',
+      payload: { operation: 'createItem' },
+    });
+  }
+
+  handleEditPriceClick = (record) => {
+    this.props.dispatch({
+      type: 'goodsModel/showModal',
+      payload: {
+        operation: 'updateItem',
+        goodsItem: record,
+      },
+    });
+  }
+
+  handleDelPriceClick = (record) => {
+    const { dispatch, location } = this.props;
+    const { search } = location;
+    confirm({
+      title: `您确定要删除此定价?`,
+      onOk () {
+        dispatch({
+          type: 'goodsModel/removeItem',
+          payload: { id: record.id },
+          callback: () => {
+            dispatch(routerRedux.push({
+              pathname: '/goods/edit',
+              search,
+            }));
+          }
+        });
+      },
+    });
+  }
+
+  handleEditTagClick = () => {
+    const { location } = this.props;
+    const { search } = location;
+    const { merchantId, pid } = queryString.parse(search);
+    this.props.dispatch({
+      type: 'goodsModel/showTagModal',
+    });
+    this.props.dispatch({
+      type: 'tagModel/query',
+      payload: {
+        pageNo: 1,
+        pageSize,
+        status: Codes.CODE_NORMAL,
+        merchantId,
+      }
+    });
+  }
+
+  handleTagModalCancel = () => {
+    this.props.dispatch({
+      type: 'goodsModel/hideTagModal',
+    });
+  }
+
+  handleTagModalOk = (data) => {
+    const { location } = this.props;
+    const { search } = location;
+    const { merchantId, pid } = queryString.parse(search);
+    this.props.dispatch({
+      type: 'goodsModel/bundleTags',
+      payload: { pid, merchantId, tags: data.map(item => item.id) },
+      callback: () => {
+        this.props.dispatch(routerRedux.push({
+          pathname: '/goods/edit',
+          search,
+        }));
+      }
+    });
+  }
+
+  handleTagModalSearch = (data) => {
+    const { location } = this.props;
+    const { search } = location;
+    const { merchantId, pid } = queryString.parse(search);
+    const newData = { ...data };
+    if (newData.keyword) {
+      newData[newData.field] = newData.keyword;
+    }
+    delete newData.field;
+    delete newData.keyword;
+
+    this.props.dispatch({
+      type: 'tagModel/query',
+      payload: {
+        ...newData,
+        pageNo: 1,
+        pageSize,
+        status: Codes.CODE_NORMAL,
+        merchantId,
+      }
+    });
+  }
+
+  handlePageExit = () => {
+    const { dispatch, mproductDetail } = this.props;
+    const { filters } = mproductDetail;
+    dispatch(routerRedux.push({
+      pathname: '/goods',
+      search: queryString.stringify(filters),
+    }));
+  }
+
+  handleTagModalTableChange = (pagination) => {
+    const { location, dispatch, mproductDetail } = this.props;
+    const { filters } = mproductDetail;
+    const { search } = location;
+    const { merchantId, pid } = queryString.parse(search);
+
+    const newFilters = { ...filters };
+    if (newFilters.keyword) {
+      newFilters[newFilters.field] = newFilters.keyword;
+    }
+    delete newFilters.field;
+    delete newFilters.keyword;
+
+    const data = {
+      ...newFilters,
+      pageNo: pagination.current,
+      pageSize: pagination.pageSize,
+      status: Codes.CODE_NORMAL,
+      merchantId,
+    };
+
+    Object.keys(data).map(key => data[key] ? null : delete data[key]);
+    dispatch({ type: 'tagModel/query', payload: { ...data } });
+  }
+
+  render(){
+    const { mproductDetail, goodsModel, tagModel, location } = this.props;
+    const { currentItem } = mproductDetail;
+    const { modalShow, tagModalShow, operation, goodsItem } = goodsModel;
+    const { list, listLoading, pagination } = tagModel;
+    const { goods, tags, type, code, name, merchantName } = currentItem;
+
+    const { search } = location;
+    const { merchantId, pid } = queryString.parse(search);
+
+    const priceModalProps = {
+      data: operation === 'createItem' ? {} : goodsItem,
+      title: operation === 'createItem' ? '添加价格' : '编辑价格',
+      visible: modalShow,
+      maskClosable: false,
+      onCancel: () => {
+        this.props.dispatch({ type: 'goodsModel/hideModal' });
+      },
+      onSubmit: (data) => {
+        const newData = { ...data, merchantId, pid, productType: type };
+        this.props.dispatch({
+          type: `goodsModel/${operation}`,
+          payload: newData,
+          callback: () => {
+            this.props.dispatch(routerRedux.push({
+              pathname: '/goods/edit',
+              search,
+            }));
+          }
+        });
+      },
+    };
+
+    const listTableProps = {
+      simple: true,
+      bordered: true,
+      pagination: false,
+      rowKey: (record) => record.id,
+      dataSource: goods,
+      columns: [{
+        title: '计价单位',
+        dataIndex: 'chargeUnit',
+        key: 'chargeUnit',
+      },{
+        title: '供应商价格(¥)',
+        dataIndex: 'cpPrice',
+        key: 'cpPrice',
+      },{
+        title: '渠道方价格(¥)',
+        dataIndex: 'merchantPrice',
+        key: 'merchantPrice',
+      },{
+        title: '终端价格(¥)',
+        dataIndex: 'terminalPrice',
+        key: 'terminalPrice',
+      },{
+        title: '操作',
+        key: 'action',
+        render: (text, record) => (
+          <span>
+            <a onClick={() => this.handleEditPriceClick(record)}>编辑</a>
+            <Divider type="vertical" />
+            <a onClick={() => this.handleDelPriceClick(record)}>删除</a>
+          </span>
+        ),
+      }],
+    };
+
+    return (
+      <PageHeaderLayout>
+        <Card
+          bordered={false}
+          title="详情"
+          style={{ marginBottom: 15 }}
+        >
+          <DescriptionList size="large" col={2} style={{ marginBottom: 32 }}>
+            <Description term="商品编号">{code}</Description>
+            <Description term="商品名称">{name}</Description>
+            <Description term="商品类型">{productType[type]}</Description>
+            <Description term="渠道名称">{merchantName}</Description>
+          </DescriptionList>
+        </Card>
+        <Card
+          bordered={false}
+          title={
+            <div>定价
+              <Divider type="vertical" />
+              <Button onClick={this.handleAddPriceClick} size="small" type="primary">添加</Button>
+            </div>
+          }
+          style={{ marginBottom: 15 }}
+        >
+          <Table { ...listTableProps }/>
+          <NewPriceModal { ...priceModalProps } />
+        </Card>
+        <Card
+          bordered={false}
+          title={
+            <div>标签
+              <Divider type="vertical" />
+              <Button onClick={this.handleEditTagClick} size="small" type="primary">选择</Button>
+            </div>
+          }
+          style={{ marginBottom: 15 }}
+        >
+          {/*标签的模态选择框*/}
+          <TagSelectModal
+            rowKeyName="id"
+            modalVisible={tagModalShow}
+            selTableData={tags || []}
+            style={{ top: 20 }}
+            fsTableDataSource={list}
+            fsTableLoading={listLoading}
+            fsTablePagination={pagination}
+            onOk={this.handleTagModalOk}
+            onCancel={this.handleTagModalCancel}
+            onSearch={this.handleTagModalSearch}
+            fsTableOnChange={this.handleTagModalTableChange}
+          />
+          {tags ? tags.map(item => <Tag color="#f50">{item.name}</Tag>) : null}
+        </Card>
+        <FooterToolbar>
+          <Button onClick={this.handlePageExit} type="primary">
+            完成
+          </Button>
+        </FooterToolbar>
+      </PageHeaderLayout>
+    );
+  }
+}

src/routes/MProduct/Edit/price.js

@@ -0,0 +1,96 @@
+import React, { PureComponent } from 'react';
+import { Modal, Form, Select, InputNumber } from 'antd';
+import { chargeUnit } from '../../../utils/config';
+
+const Option = Select.Option;
+
+@Form.create()
+export default class NewPriceModal extends PureComponent {
+
+  handleModalOnOk = () => {
+    const {
+      form: {
+        validateFields,
+        getFieldsValue,
+        resetFields,
+      },
+      data,
+      onSubmit,
+    } = this.props;
+    validateFields((errors) => {
+      if (errors) return;
+      const formData = getFieldsValue();
+      const newData = { ...formData };
+      newData.duration = chargeUnit[formData.chargeUnit];
+      data.id ? newData.id = data.id : null;
+      onSubmit(newData);
+      resetFields();
+    });
+  }
+
+  render() {
+    const { form, data, onSubmit, ...modalProps } = this.props;
+    const { getFieldDecorator } = form;
+
+    const formItemLayout = {
+      labelCol: { span: 9 },
+      wrapperCol: { span: 10 },
+    };
+
+    return (
+      <Modal { ...modalProps } onOk={this.handleModalOnOk} >
+        <Form layout="horizontal" >
+          <Form.Item label="计价单位" { ...formItemLayout }>
+            {getFieldDecorator('chargeUnit', {
+              rules: [{ required: true, type: 'string', message: '请选择一种计价单位!' }],
+              initialValue: data.chargeUnit,
+            })(
+              <Select placeholder="请选择" style={{ width: '80%' }}>
+                {Object.keys(chargeUnit).map(key => <Option value={key} key={key}>{key}</Option>)}
+              </Select>
+            )}
+          </Form.Item>
+          <Form.Item label="供应商价格" { ...formItemLayout }>
+            {getFieldDecorator('cpPrice', {
+              initialValue: data.cpPrice,
+            })(
+              <InputNumber
+                min={0}
+                style={{ width: '80%' }}
+                placeholder="请填写"
+                formatter={value => `¥ ${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')}
+                parser={value => value.replace(/\¥\s?|(,*)/g, '')}
+              />
+            )}
+          </Form.Item>
+          <Form.Item label="渠道方价格" { ...formItemLayout }>
+            {getFieldDecorator('merchantPrice', {
+              initialValue: data.merchantPrice,
+            })(
+              <InputNumber
+                min={0}
+                style={{ width: '80%' }}
+                placeholder="请填写"
+                formatter={value => `¥ ${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')}
+                parser={value => value.replace(/\¥\s?|(,*)/g, '')}
+              />
+            )}
+          </Form.Item>
+          <Form.Item label="终端价格" { ...formItemLayout }>
+            {getFieldDecorator('terminalPrice', {
+              initialValue: data.terminalPrice,
+            })(
+              <InputNumber
+                min={0}
+                style={{ width: '80%' }}
+                placeholder="请填写"
+                formatter={value => `¥ ${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')}
+                parser={value => value.replace(/\¥\s?|(,*)/g, '')}
+              />
+            )}
+          </Form.Item>
+        </Form>
+      </Modal>
+    );
+  }
+}

src/routes/MProduct/Edit/tags.js

@@ -0,0 +1,98 @@
+import React, { PureComponent } from 'react';
+import PropTypes from 'prop-types';
+import SelectModal from '../../../components/SelectModal';
+import { Codes } from '../../../utils/config';
+
+export default class TagSelectModal extends PureComponent {
+
+  render() {
+    const {
+      rowKeyName,
+      selTableData,
+      modalVisible,
+      onCancel,
+      onOk,
+      onSearch,
+      ...fsTableOpts
+    } = this.props;
+
+    const modalProps = {
+      title: '选择标签',
+      maskClosable: false,
+      visible: modalVisible,
+      onCancel,
+      onOk,
+    };
+
+    const searchProps = {
+      searchField: 'name',
+      searchKeyWord: '',
+      searchSize: 'default',
+      searchSelect: true,
+      searchSelectOptions: [{
+        value: 'name', name: '标签名称', mode: 'input',
+      }],
+      searchSelectProps: {
+        defaultValue: 'name',
+      },
+      onSearch: (value) => {
+        onSearch(value);
+      },
+    };
+
+    //已选资源列表
+    const selTableProps = {
+      operDel: true,
+      tablePagination: false,
+      tableDataSource: selTableData,
+      rowKeyName: rowKeyName,
+      tableColumns: [{
+        title: '标签名称',
+        dataIndex: 'name',
+        key: 'name',
+        width: '26%',
+      },{
+        title: '标签组名称',
+        dataIndex: 'groupName',
+        key: 'groupName',
+        width: '26%',
+      },{
+        title: '渠道名称',
+        dataIndex: 'merchantName',
+        key: 'merchantName',
+        width: '26%',
+      }]
+    };
+
+    //待选资源Table属性
+    const fsTableProps = {
+      fsTableColumns: [{
+        title: '标签名称',
+        dataIndex: 'name',
+        key: 'name',
+        width: '26%',
+      },{
+        title: '标签组名称',
+        dataIndex: 'groupName',
+        key: 'groupName',
+        width: '26%',
+      },{
+        title: '渠道名称',
+        dataIndex: 'merchantName',
+        key: 'merchantName',
+        width: '26%',
+      }],
+      ...fsTableOpts,
+    }
+
+    return (
+      <SelectModal
+        mode="multiple"
+        { ...searchProps }
+        { ...selTableProps }
+        { ...fsTableProps }
+        { ...modalProps }
+      />
+    );
+  }
+}

src/routes/Goods/List/index.js

@@ -10,12 +10,12 @@ import PageHeaderLayout from '../../../layouts/PageHeaderLayout';
 import { Codes } from '../../../utils/config';
 
 @connect(state => ({
-  goods: state.goods,
+  mproduct: state.mproduct,
   merchant: state.merchant,
 }))
-export default class GoodsList extends PureComponent {
+export default class MerchantProductList extends PureComponent {
   static propTypes = {
-    goods: PropTypes.object,
+    mproduct: PropTypes.object,
     location: PropTypes.object,
     dispatch: PropTypes.func,
   };
@@ -35,11 +35,11 @@ export default class GoodsList extends PureComponent {
   }
 
   render() {
-    const { location, dispatch, goods, merchant } = this.props;
+    const { location, dispatch, mproduct, merchant } = this.props;
     location.query = queryString.parse(location.search);
     const { query, pathname } = location;
     const { field, keyword, ...filters } = query;
-    const { list, listLoading, pagination  } = goods;
+    const { list, listLoading, pagination  } = mproduct;
 
     // 把携带的参数中空值项删除
     Object.keys(filters).map(key => { filters[key] ? null : delete filters[key] });
@@ -115,7 +115,7 @@ export default class GoodsList extends PureComponent {
       },
       onDeleteItem: (id) => {
         dispatch({
-          type: 'goods/putOffSale',
+          type: 'mproduct/putOffSale',
           payload: id,
           callback: () => {
             dispatch(
@@ -129,7 +129,7 @@ export default class GoodsList extends PureComponent {
       },
       onRecoverItem: (payload) => {
         dispatch({
-          type: 'goods/putOnSale',
+          type: 'mproduct/putOnSale',
           payload,
           callback: () => {
             dispatch(

src/routes/Tag/List/index.js

@@ -10,7 +10,7 @@ import PageHeaderLayout from '../../../layouts/PageHeaderLayout';
 import { Codes } from '../../../utils/config';
 
 @connect(state => ({
-  tag: state.tag,
+  tagModel: state.tagModel,
   merchant: state.merchant,
 }))
 export default class Tag extends PureComponent {
@@ -33,12 +33,12 @@ export default class Tag extends PureComponent {
   }
 
   render() {
-    const { location, dispatch, tag, merchant } = this.props;
+    const { location, dispatch, tagModel, merchant } = this.props;
 
     location.query = queryString.parse(location.search);
     const { query, pathname } = location;
     const { field, keyword, ...filters } = query;
-    const { list, listLoading, pagination, currentItem, itemLoading, modalVisible, modalType } = tag;
+    const { list, listLoading, pagination, currentItem, itemLoading, modalVisible, modalType } = tagModel;
 
     // 把携带的参数中空值项删除
     Object.keys(filters).map(key => { filters[key] ? null : delete filters[key] });

src/services/goods.js

@@ -1,41 +1,32 @@
 import { stringify } from 'qs';
 import request from '../utils/request';
-import { mproducts, merchantProductDetailAPI, createMerchantProductAPI } from '../utils/api';
+import { goods, bundleTag } from '../utils/api';
 
-export async function query(params) {
-  return request(`${mproducts}?${stringify(params)}`);
-}
-
-export async function queryOne(params) {
-  return request(`${merchantProductDetailAPI}?${stringify(params)}`);
+export async function create (params) {
+  const options = {
+    method: 'POST',
+    body: JSON.stringify(params),
+  };
+  return request(`${goods}`, options);
 }
 
-export async function createMerchantProduct(params) {
+export async function update (params) {
   const options = {
     method: 'PUT',
     body: JSON.stringify(params),
-  }
-  return request(`${createMerchantProductAPI}`, options);
+  };
+  return request(`${goods}`, options);
 }
 
+export async function remove ({ id }) {
+  const options = { method: 'DELETE' };
+  return request(`${goods}/${id}`, options);
+}
 
-// export async function create(params) {
-//   const options = {
-//     method: 'POST',
-//     body: JSON.stringify(params),
-//   };
-//   return request(`${merchantProduct.replace('/:id', '')}`, options);
-// }
-//
-// export async function update(params) {
-//   const options = {
-//     method: 'PUT',
-//     body: JSON.stringify(params),
-//   };
-//   return request(`${merchantProduct.replace('/:id', '')}`, options);
-// }
-//
-// export async function remove({ id }) {
-//   const options = { method: 'DELETE' }
-//   return request(`${merchantProduct.replace('/:id', `/${id}`)}`, options);
-// }
+export async function bundleTags (params) {
+  const options = {
+    method: 'PUT',
+    body: JSON.stringify(params),
+  };
+  return request(`${bundleTag}`, options);
+}

src/services/mproduct.js

@@ -0,0 +1,19 @@
+import { stringify } from 'qs';
+import request from '../utils/request';
+import { merchantProducts, merchantProduct, merchantProductCreate } from '../utils/api';
+
+export async function query(params) {
+  return request(`${merchantProducts}?${stringify(params)}`);
+}
+
+export async function queryOne(params) {
+  return request(`${merchantProduct}?${stringify(params)}`);
+}
+
+export async function createMerchantProduct(params) {
+  const options = {
+    method: 'PUT',
+    body: JSON.stringify(params),
+  }
+  return request(`${merchantProductCreate}`, options);
+}

src/services/sales.js

@@ -0,0 +1,7 @@
+import { stringify } from 'qs';
+import request from '../utils/request';
+import { soldProduct } from '../utils/api';
+
+export async function query(params) {
+  return request(`${soldProduct}?${stringify(params)}`);
+}

src/utils/api.js

@@ -14,33 +14,31 @@ module.exports = {
   terminal: `${config.apiHost}/user/:id`,
   merchants: `${config.apiHost}/merchant/list`,
   merchant: `${config.apiHost}/merchant/:id`,
-
   // 标签组及标签
   groups: `${config.apiHost}/group/list`,
   group: `${config.apiHost}/group`,
   tags: `${config.apiHost}/tag/list`,
   tag: `${config.apiHost}/tag/:id`,
-
+  // 课件/课
   wares: `${config.apiHost}/ware/list`,
   ware: `${config.apiHost}/ware/:id`,
   lessons: `${config.apiHost}/lesson/list`,
   lesson: `${config.apiHost}/lesson/:id`,
-
   // 产品接口，包括：课程、周边、课程包
   product: `${config.apiHost}/product`,
   course: `${config.apiHost}/product/course`,
   support: `${config.apiHost}/product/support`,
   combo: `${config.apiHost}/product/package`,
-
   // 渠道产品接口
-  mproducts: `${config.apiHost}/merchant/product`,
-  merchantProductDetailAPI: `${config.apiHost}/merchant/product/detail`,
-  createMerchantProductAPI: `${config.apiHost}/merchant/product/status`,
-
+  merchantProducts: `${config.apiHost}/merchant/product`,
+  merchantProduct: `${config.apiHost}/merchant/product/detail`,
+  merchantProductCreate: `${config.apiHost}/merchant/product/status`,
+  bundleTag: `${config.apiHost}/merchant/product/tags`,
+  // 商品接口
+  goods: `${config.apiHost}/goods`,
   // 订单接口
   orders: `${config.apiHost}/orders`,
   order: `${config.apiHost}/order/:id`,
-
-  // 商品挂载标签
-  goodsWithTag: `${config.apiHost}/merchant/product/tags`,
+  // 销售统计
+  soldProduct: `${config.apiHost}/soldProduct`,
 };

src/utils/config.js

@@ -9,7 +9,7 @@ Codes.CODE_IMAGE = 3;
 Codes.CODE_NORMAL = 'NORMAL';
 Codes.CODE_DELETE = 'DEL';
 
-Codes.CODE_LESSON = 'WARE';
+Codes.CODE_WARE = 'WARE';
 Codes.CODE_LESSON = 'LESSON';
 Codes.CODE_COURSE = 'COURSE';
 Codes.CODE_SUPPORT = 'SUPPORT';
@@ -23,6 +23,11 @@ Codes.CODE_LJ = 1010;
 Codes.CODE_CP = 2010;
 Codes.CODE_PJ = 3010;
 
+Codes.CODE_YEAR = '年';
+Codes.CODE_HALF_YEAR = '半年';
+Codes.CODE_SEASON = '季';
+Codes.CODE_ITEM = '件';
+
 module.exports = {
   apiHost: 'http://lj.dev.cms.api.com:8500',
   // apiHost: '/api',
@@ -74,5 +79,12 @@ module.exports = {
     [Codes.CODE_UNPAID]: '未支付',
     [Codes.CODE_PAID]: '已支付',
     [Codes.CODE_CANCEL]: '已作废',
-  }
+  },
+  // 计价单位
+  chargeUnit: {
+    [Codes.CODE_SEASON]: 90,
+    [Codes.CODE_YEAR]: 365,
+    [Codes.CODE_HALF_YEAR]: 180,
+    [Codes.CODE_ITEM]: 0,
+  },
 };