菜单名称调整

src/common/menu.js

@@ -26,7 +26,7 @@ const menuData = [
       path: 'video',
     }]
   },{
-    name: '基础产品',
+    name: '课件/课',
     icon: 'inbox',
     path: 'basic-product',
     children: [{
@@ -37,7 +37,7 @@ const menuData = [
       path: 'lesson',
     }],
   },{
-    name: '可售产品',
+    name: '平台产品',
     icon: 'appstore',
     path: 'product',
     children: [{
@@ -51,7 +51,7 @@ const menuData = [
       path: 'package',
     }]
   },{
-    name: '商品管理',
+    name: '渠道产品',
     icon: 'shop',
     path: 'goods',
   },{

src/models/mproduct/detail.js

@@ -1,3 +1,4 @@
+import { message } from 'antd';
 import { queryOne, createMerchantProduct } from '../../services/mproduct';
 import pathToRegexp from 'path-to-regexp';
 import queryString from 'query-string';
@@ -21,7 +22,7 @@ export default {
           dispatch({ type: 'queryOne', payload: { ...params } });
           dispatch({ type: 'saveFilters', payload: state });
         }
-        if (pathname === '/goods/add') {
+        if (pathname == '/goods/add') {
           dispatch({ type: 'saveFilters', payload: state });
         }
       });
@@ -42,7 +43,8 @@ export default {
     * createMerchantProduct ({ payload, callback }, { call, put }) {
       const { data, success } = yield call(createMerchantProduct, payload);
       if (success) {
-        yield put({ type: 'clearPage' });
+        message.success('创建成功!');
+        yield put({ type: 'initState' });
         if (callback) callback();
       }
     },
@@ -52,42 +54,33 @@ export default {
     changeLoading(state, { payload }) {
       return { ...state, ...payload };
     },
-
     querySuccess(state, { payload }) {
       return { ...state, currentItem: payload };
     },
-
     saveFilters(state, { payload: filters }) {
       return { ...state, filters };
     },
-
     showSupportModal(state, { payload }) {
       return { ...state, ...payload, supportModalVisible: true };
     },
-
     hideSupportModal(state) {
       return { ...state, supportModalVisible: false };
     },
-
     showResourceModal(state, { payload }) {
       return { ...state, ...payload, resourceModalVisible: true };
     },
-
     hideResourceModal(state) {
       return { ...state, resourceModalVisible: false };
     },
-
     saveSupportList(state, { payload: { supportList } }) {
       const currentItem = { ...state.currentItem, supportList };
       return { ...state, supportModalVisible: false, currentItem };
     },
-
     saveImgList(state, { payload: { imgList } }) {
       const currentItem = { ...state.currentItem, imgList };
       return { ...state, resourceModalVisible: false, currentItem };
     },
-
-    clearPage(state) {
+    initState(state) {
       return { ...state, currentItem: {}, itemLoading: false };
     }
   }

src/models/mproduct/mproduct.js

@@ -14,7 +14,7 @@ export default modelExtend(pageModel, {
   subscriptions: {
     setup({ dispatch, history }) {
       history.listen((location) => {
-        if (location.pathname === '/goods') {
+        if (location.pathname == '/goods') {
           const payload = checkSearchParams(queryString.parse(location.search));
           dispatch({
             type: 'query',
@@ -48,6 +48,7 @@ export default modelExtend(pageModel, {
     * putOnSale ({ payload, callback }, { call, put }) {
       const { data, success } = yield call(createMerchantProduct, { ...payload, status: Codes.CODE_NORMAL });
       if (success) {
+        message.success('上架成功!');
         if (callback) callback();
       }
     },
@@ -55,6 +56,7 @@ export default modelExtend(pageModel, {
     * putOffSale ({ payload, callback }, { call, put }) {
       const { data, success } = yield call(createMerchantProduct, { ...payload, status: Codes.CODE_DELETE });
       if (success) {
+        message.success('下架成功!');
         if (callback) callback();
       }
     },

src/routes/MProduct/Add/index.js

@@ -85,17 +85,17 @@ export default class MerchantProductCreate extends PureComponent {
   handleModalOk = (data) => {
     const { curClickedBtn } = this.state;
     const { dispatch } = this.props;
-    if (curClickedBtn === Codes.CODE_COURSE) {
+    if (curClickedBtn == Codes.CODE_COURSE) {
       this.setState({
         selectItem: data,
         courseModalVisible: false,
       });
-    } else if(curClickedBtn === Codes.CODE_SUPPORT) {
+    } else if(curClickedBtn == Codes.CODE_SUPPORT) {
       this.setState({
         selectItem: data,
         supportModalVisible: false,
       });
-    } else if (curClickedBtn === Codes.CODE_PACKAGE) {
+    } else if (curClickedBtn == Codes.CODE_PACKAGE) {
       this.setState({
         selectItem: data,
         packageModalVisible: false,
@@ -106,18 +106,18 @@ export default class MerchantProductCreate extends PureComponent {
   handleModalCancel = () => {
     const { curClickedBtn } = this.state;
     const { dispatch } = this.props;
-    if (curClickedBtn === Codes.CODE_COURSE) {
+    if (curClickedBtn == Codes.CODE_COURSE) {
       this.setState({ courseModalVisible: false });
-    } else if (curClickedBtn === Codes.CODE_SUPPORT) {
+    } else if (curClickedBtn == Codes.CODE_SUPPORT) {
       this.setState({ supportModalVisible: false });
-    } else if (curClickedBtn === Codes.CODE_PACKAGE) {
+    } else if (curClickedBtn == Codes.CODE_PACKAGE) {
       this.setState({ packageModalVisible: false });
     }
   }
 
   handleModalShow = (name) => {
     const { dispatch } = this.props;
-    if (name === Codes.CODE_COURSE) {
+    if (name == Codes.CODE_COURSE) {
       this.setState({
         curClickedBtn: name,
         courseModalVisible: true,
@@ -130,7 +130,7 @@ export default class MerchantProductCreate extends PureComponent {
           }
         });
       })
-    } else if (name === Codes.CODE_SUPPORT) {
+    } else if (name == Codes.CODE_SUPPORT) {
       this.setState({
         curClickedBtn: name,
         supportModalVisible: true,
@@ -143,7 +143,7 @@ export default class MerchantProductCreate extends PureComponent {
           }
         });
       })
-    } else if (name === Codes.CODE_PACKAGE) {
+    } else if (name == Codes.CODE_PACKAGE) {
       this.setState({
         curClickedBtn: name,
         packageModalVisible: true,
@@ -180,11 +180,11 @@ export default class MerchantProductCreate extends PureComponent {
 
     const data = { ...newFilters, ...tableFilters, pageNo: pagination.current, pageSize: pagination.pageSize };
     Object.keys(data).map(key => data[key] ? null : delete data[key]);
-    if (curClickedBtn === Codes.CODE_COURSE) {
+    if (curClickedBtn == Codes.CODE_COURSE) {
       dispatch({ type: 'course/query', payload: { ...data } });
-    } else if (curClickedBtn === Codes.CODE_SUPPORT) {
+    } else if (curClickedBtn == Codes.CODE_SUPPORT) {
       dispatch({ type: 'support/query', payload: { ...data } });
-    } else if (curClickedBtn === Codes.CODE_PACKAGE) {
+    } else if (curClickedBtn == Codes.CODE_PACKAGE) {
       dispatch({ type: 'combo/query', payload: { ...data } });
     }
   }

src/routes/MProduct/List/index.js

@@ -1,5 +1,4 @@
 import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
 import queryString from 'query-string';
 import { connect } from 'dva';
 import { routerRedux } from 'dva/router';
@@ -14,12 +13,6 @@ import { Codes } from '../../../utils/config';
   merchant: state.merchant,
 }))
 export default class MerchantProductList extends PureComponent {
-  static propTypes = {
-    mproduct: PropTypes.object,
-    location: PropTypes.object,
-    dispatch: PropTypes.func,
-  };
-
   // 组件挂载完成，加载1000条渠道商信息用于渠道筛选
   componentDidMount() {
     const {dispatch} = this.props;
@@ -29,7 +22,6 @@ export default class MerchantProductList extends PureComponent {
         pageNo: 1,
         pageSize: 1000,
         domain: Codes.CODE_PJ,
-        status: Codes.CODE_NORMAL,
       }
     });
   }
@@ -79,7 +71,6 @@ export default class MerchantProductList extends PureComponent {
       location,
       dataSource: list,
       loading: listLoading,
-      curStatus: filters.status,
       merchantList: merchant.list,
       curMid: filters.merchantId,
       onChange: (pagination, filterArgs) => {

src/routes/MProduct/List/search.js

@@ -1,18 +1,9 @@
 import react, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
 import { Button, Form, Row, Col, Icon } from 'antd';
 import DataSearch from '../../../components/DataSearch';
 
 @Form.create()
 export default class Search extends PureComponent {
-  static propTypes = {
-    form: PropTypes.object.isRequired,
-    onSearch: PropTypes.func,
-    onAdd: PropTypes.func,
-    field: PropTypes.string,
-    keyword: PropTypes.string,
-  };
-
   render() {
     const { field, keyword, onSearch, onAdd } = this.props;
 
@@ -27,7 +18,7 @@ export default class Search extends PureComponent {
         value: 'code', name: '产品编号', mode: 'input',
       }],
       selectProps: {
-        defaultValue: field || 'name',
+        defaultValue: field || 'code',
       },
       onSearch: (value) => {
         onSearch(value);
@@ -40,7 +31,7 @@ export default class Search extends PureComponent {
           <DataSearch { ...searchGroupProps } />
         </Col>
         <Col lg={{ offset: 7, span: 7 }} md={12} sm={8} xs={24} style={{ marginBottom: 16, textAlign: 'right' }}>
-          <Button type="primary" onClick={onAdd}><Icon type="plus-circle" />创建商品</Button>
+          <Button type="primary" onClick={onAdd}><Icon type="plus-circle" />新建</Button>
         </Col>
       </Row>
     );

src/routes/MProduct/List/table.js

@@ -1,23 +1,20 @@
 import React, { PureComponent } from 'react';
-import PropTypes from 'prop-types';
 import moment from 'moment';
-import classnames from 'classnames';
 import queryString from 'query-string';
-import { Divider, Modal, Table, Menu, Icon, Badge } from 'antd';
-import AnimTableBody from '../../../components/Animation/AnimTableBody';
+import { Divider, Modal, Table, Icon, Badge } from 'antd';
 import { itemStatuses, Codes, productType } from '../../../utils/config';
-import styles from './table.less';
 
 export default class TableList extends PureComponent {
-
   handleOperateItem = (record) => {
     const { onDeleteItem, onRecoverItem } = this.props;
     Modal.confirm({
-      title: `您确定要${record.status === Codes.CODE_NORMAL ? '下架' : '出售'}该产品?`,
+      title: `您确定要${record.status == Codes.CODE_NORMAL ? '下架' : '出售'}该产品?`,
+      okText: '确定',
+      cancelText: '取消',
       onOk () {
-        if (record.status === Codes.CODE_NORMAL) {
+        if (record.status == Codes.CODE_NORMAL) {
           onDeleteItem({ pid: record.pid, merchantId: record.merchantId, status: Codes.CODE_DELETE });
-        } else if (record.status === Codes.CODE_DELETE) {
+        } else {
           onRecoverItem({ pid: record.pid, merchantId: record.merchantId, status: Codes.CODE_NORMAL });
         }
       },
@@ -65,9 +62,6 @@ export default class TableList extends PureComponent {
         const statusMap = {[Codes.CODE_NORMAL]: 'success', [Codes.CODE_DELETE]: 'error'};
         return (<Badge status={statusMap[record.status]} text={itemStatuses[record.status]} />);
       },
-      filters: Object.keys(itemStatuses).map(key => ({ text: itemStatuses[key], value: key })),
-      filterMultiple: false,
-      filteredValue: [curStatus],
     },{
       title: '创建时间',
       dataIndex: 'gmtModified',
@@ -83,34 +77,26 @@ export default class TableList extends PureComponent {
         <div>
           <a onClick={() => onEditItem(record)}>编辑</a>
           <Divider type="vertical" />
-          <a onClick={() => this.handleOperateItem(record)}>{record.status === Codes.CODE_NORMAL ? '下架' : '出售'}</a>
+          <a onClick={() => this.handleOperateItem(record)}>{record.status == Codes.CODE_NORMAL ? '下架' : '出售'}</a>
         </div>
       )
     }];
 
     // 数据table列表表头的筛选按钮点击重置后status与merchantId值为空，此时删除该参数
     columns.map(item => {
-      item.dataIndex === 'status' && !curStatus ? delete item.filteredValue : null;
-      item.dataIndex === 'merchantId' && !curMid ? delete item.filteredValue : null;
+      item.dataIndex == 'merchantId' && !curMid ? delete item.filteredValue : null;
     });
 
     // 配置分页
     tableProps.pagination = !!pagination && { ...pagination, showSizeChanger: true, showQuickJumper: true, showTotal: total => `共 ${total} 条`};
 
-    // 添加动画
-    const AnimationTableBody = (props) => (<AnimTableBody {...props}/>);
-
     return (
       <Table
         simple
         bordered
         { ...tableProps }
         columns={columns}
-        className={classnames({ [styles.table]: true, [styles.motion]: true })}
         rowKey={record => record.id}
-        components={{
-          body: { wrapper: AnimationTableBody }
-        }}
       />
     );
   }

src/routes/MProduct/List/table.less

@@ -1,86 +0,0 @@
-@import "~antd/lib/style/themes/default.less";
-@import "../../../utils/utils.less";
-
-.table {
-  :global {
-    .ant-table-tbody > tr > td,
-    .ant-table-thead > tr > th {
-      height: 50px;
-    }
-  }
-
-  &.motion {
-    :global {
-      .ant-table-tbody > tr > td,
-      .ant-table-thead > tr > th {
-        &:nth-child(1) {
-          width: 15%;
-        }
-
-        &:nth-child(2) {
-          width: 15%;
-        }
-
-        &:nth-child(3) {
-          width: 15%;
-        }
-
-        &:nth-child(4) {
-          width: 15%;
-        }
-
-        &:nth-child(5) {
-          width: 10%;
-        }
-
-        &:nth-child(6) {
-          width: 18%;
-        }
-
-        &:nth-child(7) {
-          width: 12%;
-        }
-      }
-
-      .ant-table-thead {
-        & > tr {
-          transition: none;
-          display: block;
-
-          & > th {
-            display: inline-flex;
-            align-items: center;
-            justify-content: center;
-          }
-        }
-      }
-
-      .ant-table-tbody {
-        & > tr {
-          transition: none;
-          display: block;
-          border-bottom: 1px solid #f5f5f5;
-
-          & > td {
-            border-bottom: none;
-            display: inline-flex;
-            align-items: center;
-            justify-content: center;
-          }
-
-          &.ant-table-expanded-row-level-1 > td {
-            height: auto;
-          }
-        }
-      }
-    }
-  }
-}
-
-.splitLine {
-  background: @border-color-split;
-  display: inline-block;
-  margin: 0 8px;
-  width: 1px;
-  height: 12px;
-}