修改产品管理部分的细节问题

src/models/combo/detail.js

@@ -17,9 +17,9 @@ export default {
   subscriptions: {
     setup({ dispatch, history }) {
       history.listen(({ pathname, state, ...rest }) => {
-        const match = pathToRegexp('/product/package/edit/:id').exec(pathname);
+        const match = pathToRegexp('/product/package/edit/:pid').exec(pathname);
         if (match) {
-          dispatch({ type: 'query', payload: { id: match[1] } });
+          dispatch({ type: 'query', payload: { pid: match[1] } });
           dispatch({ type: 'saveFilters', payload: state });
           dispatch({ type: 'saveOperType', payload: { operType: 'update' } });
         }

src/models/course/detail.js

@@ -19,9 +19,9 @@ export default {
   subscriptions: {
     setup({ dispatch, history }) {
       history.listen(({ pathname, state, ...rest }) => {
-        const match = pathToRegexp('/product/course/edit/:id').exec(pathname);
+        const match = pathToRegexp('/product/course/edit/:pid').exec(pathname);
         if (match) {
-          dispatch({ type: 'query', payload: { id: match[1] } });
+          dispatch({ type: 'query', payload: { pid: match[1] } });
           dispatch({ type: 'saveFilters', payload: state });
           dispatch({ type: 'saveOperType', payload: { operType: 'update' } });
         }

src/models/lesson/detail.js

@@ -1,3 +1,4 @@
+import { message } from 'antd';
 import { queryOne, create, update } from '../../services/lesson';
 import pathToRegexp from 'path-to-regexp';
 import { Codes } from '../../utils/config';
@@ -36,22 +37,23 @@ export default {
       yield put({ type: 'changeLoading', payload: { itemLoading: true } });
       const { data, success } = yield call(queryOne, payload);
       if (success) {
-        yield put({ type: 'querySuccess', payload: { ...data } });
+        yield put({ type: 'querySuccess', payload: data });
       }
       yield put({ type: 'changeLoading', payload: { itemLoading: false } });
     },
     * create ({ payload, callback }, { call, put }) {
-      // 创建课，默认状态为NORMAL
-      const { data, success } = yield call(create, { ...payload, status: Codes.CODE_NORMAL });
+      const { data, success } = yield call(create, payload);
       if (success) {
-        yield put({ type: 'clearPage' });
+        message.success('创建成功!');
         if (callback) callback();
+        yield put({ type: 'initState' });
       }
     },
     * update ({ payload, callback }, { call, put }) {
       const { data, success } = yield call(update, payload);
       if (success) {
-        yield put({ type: 'clearPage' });
+        message.success('修改成功!');
+        yield put({ type: 'initState' });
         if (callback) callback();
       }
     }
@@ -61,33 +63,26 @@ export default {
     changeLoading(state, { payload }) {
       return { ...state, ...payload };
     },
-
     querySuccess(state, { payload }) {
       return { ...state, currentItem: payload };
     },
-
     saveFilters(state, { payload: filters }) {
       return { ...state, filters };
     },
-
     showModal(state) {
       return { ...state, modalVisible: true };
     },
-
     hideModal(state) {
       return { ...state, modalVisible: false };
     },
-
     saveOperType(state, { payload }) {
       return { ...state, ...payload };
     },
-
     saveSortResult(state, { payload: { wareList } }) {
       const currentItem = { ...state.currentItem, wareList };
       return { ...state, modalVisible: false, currentItem };
     },
-
-    clearPage(state) {
+    initState(state) {
       return { ...state, currentItem: {}, itemLoading: false };
     }
   }

src/models/resource.js

@@ -3,7 +3,7 @@ import { query, remove, update, create, getSignature } from '../services/resourc
 import modelExtend from 'dva-model-extend';
 import queryString from 'query-string';
 import { pageModel } from './common';
-import { pageSize } from '../utils/config';
+import { pageSize, Codes } from '../utils/config';
 import { checkSearchParams } from '../utils/utils';
 
 export default modelExtend(pageModel, {
@@ -23,7 +23,7 @@ export default modelExtend(pageModel, {
       history.listen((location) => {
         if (location.pathname === '/resource/gallery') {
           const payload = checkSearchParams(queryString.parse(location.search));
-          payload.type = config.Codes.CODE_IMAGE, // 只查询图片类型
+          payload.type = Codes.CODE_IMAGE, // 只查询图片类型
           dispatch({
             type: 'query',
             payload,
@@ -31,7 +31,7 @@ export default modelExtend(pageModel, {
         }
         if (location.pathname === '/resource/video') {
           const payload = checkSearchParams(queryString.parse(location.search));
-          payload.type = config.Codes.CODE_VIDEO, // 只查询视频类型
+          payload.type = Codes.CODE_VIDEO, // 只查询视频类型
           dispatch({
             type: 'query',
             payload,

src/models/support/detail.js

@@ -18,9 +18,9 @@ export default {
   subscriptions: {
     setup({ dispatch, history }) {
       history.listen(({ pathname, state, ...rest }) => {
-        const match = pathToRegexp('/product/support/edit/:id').exec(pathname);
+        const match = pathToRegexp('/product/support/edit/:pid').exec(pathname);
         if (match) {
-          dispatch({ type: 'query', payload: { id: match[1] } });
+          dispatch({ type: 'query', payload: { pid: match[1] } });
           dispatch({ type: 'saveFilters', payload: state });
           dispatch({ type: 'saveOperType', payload: { operType: 'update' } });
         }

src/routes/Combo/Edit/index.js

@@ -5,7 +5,7 @@ import { Card, Table, Form, Spin, Input, InputNumber, Button, Icon, message } fr
 import queryString from 'query-string';
 import PageHeaderLayout from '../../../layouts/PageHeaderLayout';
 import ProductSelectModal from './product';
-import { Codes, pageSize } from '../../../utils/config';
+import { Codes, pageSize, productType } from '../../../utils/config';
 
 @Form.create()
 @connect(state => ({
@@ -13,14 +13,15 @@ import { Codes, pageSize } from '../../../utils/config';
   product: state.product,
 }))
 export default class PackageProfile extends PureComponent {
+  state = { proType: [Codes.CODE_COURSE] }; // 产品类型[默认为课程资源]
 
   handleEditProuctClick = () => {
+    const { proType } = this.state;
     this.props.dispatch({ type: 'comboDetail/showModal' });
     this.props.dispatch({
       type: 'product/query',
       payload: {
-        type: Codes.CODE_COURSE,
-        status: Codes.CODE_NORMAL,
+        type: proType[0],
         pageNo: 1,
         pageSize,
       }
@@ -51,16 +52,18 @@ export default class PackageProfile extends PureComponent {
 
   handleProductModalSearch = (data) => {
     const newData = { ...data };
+    const { proType } = this.state;
     if (newData.keyword) {
       newData[newData.field] = newData.keyword;
     }
     delete newData.field;
     delete newData.keyword;
+
     this.props.dispatch({
       type: 'product/query',
       payload: {
-        type: Codes.CODE_COURSE,
-        status: Codes.CODE_NORMAL,
+        ...newData,
+        type: proType[0],
         pageNo: 1,
         pageSize,
       }
@@ -68,6 +71,15 @@ export default class PackageProfile extends PureComponent {
   }
 
   handleProductModalTableChange = (pagination, filterArgs, filters) => {
+    // 待选资源列表中资源类型过滤选项
+    const { type } = filterArgs;
+    if (Array.isArray(type) && type.length) {
+      this.setState({ proType: type.map(item => item) });
+    } else {
+      this.setState({ proType: [Codes.CODE_COURSE] });
+      filterArgs.type = [Codes.CODE_COURSE];
+    }
+
     const newFilters = { ...filters };
     if (newFilters.keyword) {
       newFilters[newFilters.field] = newFilters.keyword;
@@ -75,15 +87,17 @@ export default class PackageProfile extends PureComponent {
     delete newFilters.field;
     delete newFilters.keyword;
 
-    const data = {
-      ...newFilters,
-      pageNo: pagination.current,
-      pageSize: pagination.pageSize,
-      status: Codes.CODE_NORMAL,
-    };
+    // table header filter
+    const getValue = obj => Object.keys(obj).map(key => obj[key]).join(',');
+    const tableFilters = Object.keys(filterArgs).reduce((obj, key) => {
+      const newObj = { ...obj };
+      newObj[key] = getValue(filterArgs[key]);
+      return newObj;
+    }, {});
 
+    const data = { ...newFilters, ...tableFilters, pageNo: pagination.current, pageSize: pagination.pageSize };
     Object.keys(data).map(key => data[key] ? null : delete data[key]);
-    dispatch({ type: 'product/query', payload: data });
+    this.props.dispatch({ type: 'product/query', payload: data });
   }
 
   handlePageCancel = () => {
@@ -92,6 +106,7 @@ export default class PackageProfile extends PureComponent {
       pathname: '/product/package',
       search: queryString.stringify(filters),
     }));
+    this.props.dispatch({ type: 'comboDetail/initState' });
   }
 
   handlePageSubmit = (e) => {
@@ -119,6 +134,7 @@ export default class PackageProfile extends PureComponent {
       // add params `status`
       if (operType === 'create') {
         data.status = Codes.CODE_NORMAL;
+        data.type = Codes.CODE_PACKAGE;
       }
       else if (operType === 'update') {
         data.status = currentItem.status;
@@ -139,6 +155,7 @@ export default class PackageProfile extends PureComponent {
 
   render() {
     const { form, comboDetail, product } = this.props;
+    const { proType } = this.state;
     const { modalShow, currentItem, itemLoading } = comboDetail;
     const { list, listLoading, pagination } = product;
     const { products } = currentItem;
@@ -161,22 +178,31 @@ export default class PackageProfile extends PureComponent {
     };
 
     const columns = [{
-      title: '产品封面',
-      dataIndex: 'coverUrl',
-      key: 'coverUrl',
-      render: (text, record) => {},
-    },{
-      title: '产品编号',
+    //   title: '封面',
+    //   dataIndex: 'coverUrl',
+    //   key: 'coverUrl',
+    //   render: (text, record) => {},
+    // },{
+      title: '编号',
       dataIndex: 'code',
       key: 'code',
+      width: '20%',
     },{
-      title: '产品名称',
+      title: '名称',
       dataIndex: 'name',
       key: 'name',
+      width: '20%',
+    },{
+      title: '类型',
+      dataIndex: 'type',
+      key: 'type',
+      render: (text, record) => productType[text],
+      width: '15%',
     },{
       title: '供应商',
       dataIndex: 'cpName',
       key: 'cpName',
+      width: '17%',
     },{
       title: '供应商价格',
       dataIndex: 'cpPrice',
@@ -190,6 +216,7 @@ export default class PackageProfile extends PureComponent {
           parser={value => value.replace(/\¥\s?|(,*)/g, '')}
         />
       ),
+      width: '28%',
     }];
 
     return (
@@ -220,7 +247,7 @@ export default class PackageProfile extends PureComponent {
                   rowKey={record => record.id}
                   locale={{
                     emptyText: <span style={{ color: "#C6D0D6" }}>&nbsp;&nbsp;<Icon type="frown-o"/>
-                      该产品包内暂无相关产品!</span>
+                      该产品包内暂无相关内容!</span>
                   }}
                 />
               </Form.Item>
@@ -234,10 +261,12 @@ export default class PackageProfile extends PureComponent {
               rowKeyName="id"
               modalVisible={modalShow}
               selTableData={products || []}
+              width={600}
               style={{ top: 20 }}
               fsTableDataSource={list}
               fsTableLoading={listLoading}
               fsTablePagination={pagination}
+              fsFilteredValue={proType}
               onOk={this.handleProductModalOk}
               onCancel={this.handleProductModalCancel}
               onSearch={this.handleProductModalSearch}

src/routes/Combo/Edit/product.js

@@ -1,8 +1,7 @@
 import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
-// import { InputNumber } from 'antd';
 import SelectModal from '../../../components/SelectModal';
-import { Codes } from '../../../utils/config';
+import { Codes, productType } from '../../../utils/config';
 
 export default class ProductSelectModal extends PureComponent {
 
@@ -14,6 +13,7 @@ export default class ProductSelectModal extends PureComponent {
       onCancel,
       onOk,
       onSearch,
+      fsFilteredValue,
       ...fsTableOpts
     } = this.props;
 
@@ -36,7 +36,7 @@ export default class ProductSelectModal extends PureComponent {
         value: 'code', name: '产品编号', mode: 'input',
       }],
       searchSelectProps: {
-        defaultValue: 'name',
+        defaultValue: 'code',
       },
       onSearch: (value) => {
         onSearch(value);
@@ -50,40 +50,53 @@ export default class ProductSelectModal extends PureComponent {
       tableDataSource: selTableData,
       rowKeyName: rowKeyName,
       tableColumns: [{
-        title: '产品编号',
+        title: '编号',
         dataIndex: 'code',
         key: 'code',
-        width: '30%',
+        width: '25%',
       },{
-        title: '产品名称',
+        title: '名称',
         dataIndex: 'name',
         key: 'name',
-        width: '30%',
+        width: '25%',
+      },{
+        title: '类型',
+        dataIndex: 'type',
+        render: (text, record) => productType[text],
+        width: '17%',
       },{
         title: '供应商',
         dataIndex: 'cpName',
         key: 'cpName',
-        width: '20%',
+        width: '17%',
       }]
     };
 
     //待选资源Table属性
     const fsTableProps = {
       fsTableColumns: [{
-        title: '产品编号',
+        title: '编号',
         dataIndex: 'code',
         key: 'code',
-        width: '30%',
+        width: '25%',
       },{
-        title: '产品名称',
+        title: '名称',
         dataIndex: 'name',
         key: 'name',
-        width: '30%',
+        width: '25%',
+      },{
+        title: '类型',
+        dataIndex: 'type',
+        render: (text, record) => (productType[record.type]),
+        filters: Object.keys(productType).map(key => ({ text: productType[key], value: key })),
+        filterMultiple: false,
+        filteredValue: fsFilteredValue,
+        width: '16%',
       },{
         title: '供应商',
         dataIndex: 'cpName',
         key: 'cpName',
-        width: '20%',
+        width: '17%',
       }],
       ...fsTableOpts,
     }

src/routes/Combo/List/search.js

@@ -27,7 +27,7 @@ export default class Search extends PureComponent {
         value: 'code', name: '课程包编号', mode: 'input',
       }],
       selectProps: {
-        defaultValue: field || 'name',
+        defaultValue: field || 'code',
       },
       onSearch: (value) => {
         onSearch(value);

src/routes/Combo/List/table.js

@@ -17,7 +17,7 @@ export default class TableList extends PureComponent {
       onOk () {
         if (record.status === Codes.CODE_NORMAL) {
           onDeleteItem({id: record.id});
-        } else if (record.status === Codes.CODE_DELETE) {
+        } else {
           onRecoverItem({ id: record.id, status: Codes.CODE_NORMAL });
         }
       },
@@ -47,11 +47,11 @@ export default class TableList extends PureComponent {
       filterMultiple: false,
       filteredValue: [curStatus],
     },{
-      title: '添加时间',
-      dataIndex: 'gmtCreated',
-      key: 'gmtCreated',
+      title: '修改时间',
+      dataIndex: 'gmtModified',
+      key: 'gmtModified',
       render: (text, record) => (
-        <div>{moment(text).format('YYYY-MM-DD')}</div>
+        <div>{moment(text).format('YYYY-MM-DD HH:mm:ss')}</div>
       )
     },{
       title: '操作',

src/routes/Course/Edit/index.js

@@ -170,11 +170,11 @@ export default class CourseDetail extends PureComponent {
     Object.keys(data).map(key => data[key] ? null : delete data[key]);
 
     if (curClickedBtn === 'lessonBtn') {
-      dispatch({ type: `lesson/query`, payload: { ...data, status: Codes.CODE_NORMAL } });
+      dispatch({ type: `lesson/query`, payload: data });
     } else if (curClickedBtn === 'cvImgBtn' || curClickedBtn === 'bgImgBtn') {
-      dispatch({ type: `resource/query`, payload: { ...data, status: Codes.CODE_NORMAL, type: Codes.CODE_IMAGE } });
+      dispatch({ type: `resource/query`, payload: { ...data, type: Codes.CODE_IMAGE } });
     } else if (curClickedBtn === 'supportBtn') {
-      dispatch({ type: `support/query`, payload: { ...data, status: Codes.CODE_NORMAL } });
+      dispatch({ type: `support/query`, payload: data });
     }
   }
 
@@ -221,7 +221,7 @@ export default class CourseDetail extends PureComponent {
         supportList: newSupportList,
       };
 
-      // 加入状态/id
+      // 加入状态/类型
       if (operType == 'create') {
         data.type = Codes.CODE_COURSE;
         data.status = Codes.CODE_NORMAL;
@@ -252,6 +252,7 @@ export default class CourseDetail extends PureComponent {
         search: queryString.stringify(filters),
       })
     );
+    dispatch({ type: 'courseDetail/initState' });
   }
 
   render() {

src/routes/Course/List/index.js

@@ -82,10 +82,10 @@ export default class Course extends PureComponent {
           }),
         }));
       },
-      onEditItem: (item) => {
+      onEditItem: ({ pid }) => {
         dispatch(
           routerRedux.push({
-            pathname: `/product/course/edit/${item.id}`,
+            pathname: `/product/course/edit/${pid}`,
             state: filters,
           })
         );

src/routes/Course/List/table.js

@@ -47,11 +47,11 @@ export default class TableList extends PureComponent {
       filterMultiple: false,
       filteredValue: [curStatus],
     },{
-      title: '添加时间',
-      dataIndex: 'gmtCreated',
-      key: 'gmtCreated',
+      title: '修改时间',
+      dataIndex: 'gmtModified',
+      key: 'gmtModified',
       render: (text, record) => (
-        <div>{moment(text).format('YYYY-MM-DD')}</div>
+        <div>{moment(text).format('YYYY-MM-DD HH:mm:ss')}</div>
       )
     },{
       title: '操作',

src/routes/Lesson/Edit/index.js

@@ -50,12 +50,10 @@ export default class LessonDetail extends PureComponent {
     const newData = { ...data };
     if (newData.keyword) {
       newData[newData.field] = newData.keyword;
-      delete newData.field;
-      delete newData.keyword;
-    } else {
-      delete newData.field;
-      delete newData.keyword;
     }
+    delete newData.field;
+    delete newData.keyword;
+
     dispatch({
       type: 'ware/query',
       payload: { ...newData, pageNo: 1, pageSize: 10 },
@@ -68,12 +66,10 @@ export default class LessonDetail extends PureComponent {
     const newFilters = { ...filters };
     if (newFilters.keyword) {
       newFilters[newFilters.field] = newFilters.keyword;
-      delete newFilters.field;
-      delete newFilters.keyword;
-    } else {
-      delete newFilters.field;
-      delete newFilters.keyword;
     }
+    delete newFilters.field;
+    delete newFilters.keyword;
+
     const getValue = obj => Object.keys(obj).map(key => obj[key]).join(',');
     const tableFilters = Object.keys(filterArgs).reduce((obj, key) => {
       const newObj = { ...obj };
@@ -102,11 +98,23 @@ export default class LessonDetail extends PureComponent {
       }
     } = this.props;
     validateFields((errors) => {
-      if (errors) { return; }
+      if (errors) return;
+
+      const { wareList, gmtCreated, gmtModified, ...rest } = currentItem;
       const data = {
-        ...currentItem,
+        ...rest,
         ...getFieldsValue(),
       };
+
+      // 课件数组id list
+      const idList = (wareList || []).map(item => item.id);
+      data.wareList = idList;
+
+      // 新建课，status设为normal
+      if (operType == 'create') {
+        data.status = Codes.CODE_NORMAL;
+      }
+
       dispatch({
         type: `lessonDetail/${operType}`,
         payload: data,
@@ -117,15 +125,15 @@ export default class LessonDetail extends PureComponent {
               search: queryString.stringify(filters),
             })
           );
+          resetFields();
         }
-      })
-      resetFields();
+      });
     });
   }
 
   handlePageCancel = () => {
     const { dispatch, lessonDetail: { filters } } = this.props;
-    dispatch({ type: 'lessonDetail/clearPage' });
+    dispatch({ type: 'lessonDetail/initState' });
     dispatch(
       routerRedux.push({
         pathname: '/product/lesson',

src/routes/Lesson/List/search.js

@@ -27,7 +27,7 @@ export default class Search extends PureComponent {
         value: 'code', name: '课编号', mode: 'input',
       }],
       selectProps: {
-        defaultValue: field || 'name',
+        defaultValue: field || 'code',
       },
       onSearch: (value) => {
         onSearch(value);

src/routes/Lesson/List/table.js

@@ -17,7 +17,7 @@ export default class TableList extends PureComponent {
       onOk () {
         if (record.status === Codes.CODE_NORMAL) {
           onDeleteItem({id: record.id});
-        } else if (record.status === Codes.CODE_DELETE) {
+        } else {
           onRecoverItem({ id: record.id, status: Codes.CODE_NORMAL });
         }
       },
@@ -47,12 +47,12 @@ export default class TableList extends PureComponent {
       filterMultiple: false,
       filteredValue: [curStatus],
     },{
-      title: '添加时间',
-      dataIndex: 'gmtCreated',
-      key: 'gmtCreated',
+      title: '修改时间',
+      dataIndex: 'gmtModified',
+      key: 'gmtModified',
       render: (text, record) => (
-        <div>{moment(text).format('YYYY-MM-DD')}</div>
-      )
+        <div>{moment(text).format('YYYY-MM-DD HH:mm:ss')}</div>
+      ),
     },{
       title: '操作',
       dataIndex: 'operation',
@@ -61,7 +61,7 @@ export default class TableList extends PureComponent {
         <div>
           <a onClick={() => onEditItem(record)}>编辑</a>
           <span className={styles.splitLine} />
-            <a onClick={() => this.handleOperateItem(record)}>{record.status === Codes.CODE_NORMAL ? '删除' : '恢复'}</a>
+          <a onClick={() => this.handleOperateItem(record)}>{record.status === Codes.CODE_NORMAL ? '删除' : '恢复'}</a>
         </div>
       )
     }];

src/routes/Order/Add/index.js

@@ -1,6 +1,7 @@
 import React, { Component } from 'react';
 import { connect } from 'dva';
 import { routerRedux } from 'dva/router';
+import queryString from 'query-string';
 import {
   Popover,
   Modal,
@@ -70,6 +71,7 @@ export default class CreateOrder extends Component {
         address: record.address,
       }
     });
+    this.props.dispatch({ type: 'orderDetail/hideTerminalModal' });
   }
 
   handleTerminalModalCancel = () => {
@@ -127,25 +129,40 @@ export default class CreateOrder extends Component {
     });
   }
 
+  handlePageCancel = () => {
+    const { orderDetail, dispatch } = this.props;
+    const { filters } = orderDetail;
+    dispatch(routerRedux.push({
+      pathname: '/order',
+      search: queryString.stringify(filters),
+    }));
+  }
+
   /**
    * @desc 对返回的单个订单数据进行加工，方便在table中进行展示及编辑
    * @param {Object}
    * @return {Object}
    */
-  renderTableList = (data) => {
-    const fomtProducts = data.map(item => {
-      if (item.contents) {
+  formatTableDatas = (data) => {
+    const fmtProducts = data.map(item => {
+      // 课程包类型的产品加入children字段
+      if (item.type == Codes.CODE_PACKAGE) {
         item.children = item.contents;
-        delete item.contents;
+        item.isChild = true;
       }
+      // 把goods列表的第一项设置为默认选中项
       if (item.goods && item.goods.length) {
         item.goods.map((goodsItem, index) => {
           if (index == 0) {
             item.goods[index].selected = true;
           }
-        })
+        });
+      } else {
+        item.goods = [];
       }
+      return item;
     });
+    return fmtProducts;
   }
 
   render() {
@@ -153,6 +170,7 @@ export default class CreateOrder extends Component {
     const { userInfo, products } = this.state;
     const { getFieldDecorator } = form;
     const { terminalModalShow, productModalShow } = orderDetail;
+    const fmtProducts = this.formatTableDatas(products);
 
     const formItemLayout = {
       labelCol: {
@@ -168,6 +186,7 @@ export default class CreateOrder extends Component {
 
     const columns = [{
       title: '序号',
+      dataIndex: 'sort',
       render: (text, record, index) => index + 1,
       width: '6%',
       key: 0,
@@ -194,8 +213,10 @@ export default class CreateOrder extends Component {
       render: (text, record) => {
         if (!record.isChild) {
           return (
-            <Select>
-              {record.goods.map(item => <Select.Option key={item.id}>{`¥${item.terminalPrice} / ${item.chargeUnit}`}</Select.Option>)}
+            <Select
+              value={record.goods.filter(item => item.selected)[0].id}
+            >
+              {record.goods.map(item => <Select.Option key={item.id} value={item.id}>{`¥${item.terminalPrice} / ${item.chargeUnit}`}</Select.Option>)}
             </Select>
           );
         } else {
@@ -207,11 +228,25 @@ export default class CreateOrder extends Component {
       title: '供应商售价',
       dataIndex: 'cpPrice',
       key: 5,
+      render: (text, record) => {
+        if (!record.isChild) {
+          return record.goods.filter(item => item.selected)[0].cpPrice;
+        } else {
+          return '-';
+        }
+      },
       width: '10%',
     },{
       title: '领教售价',
       dataIndex: 'merchantPrice',
       key: 6,
+      render: (text, record) => {
+        if (!record.isChild) {
+          return record.goods.filter(item => item.selected)[0].merchantPrice;
+        } else {
+          return '-';
+        }
+      },
       width: '10%',
     },{
       title: '渠道售价',
@@ -219,7 +254,7 @@ export default class CreateOrder extends Component {
       key: 7,
       render: (text, record) => {
         if (!record.isChild) {
-          return text;
+          return record.goods.filter(item => item.selected)[0].terminalPrice;
         } else {
           return '-';
         }
@@ -246,6 +281,7 @@ export default class CreateOrder extends Component {
       width: '6%',
     },{
       title: '小计',
+      dataIndex: 'total',
       key: 9,
       render: (text, record, index) => {
 
@@ -324,7 +360,7 @@ export default class CreateOrder extends Component {
                 rowKey={record => record.id}
                 pagination={false}
                 columns={columns}
-                dataSource={goodsList}
+                dataSource={fmtProducts}
               />
             </Form.Item>
           </Form>
@@ -346,7 +382,7 @@ export default class CreateOrder extends Component {
           <MerchantProductSelectModal
             rowKeyName="id"
             modalVisible={productModalShow}
-            selTableData={goodsList || []}
+            selTableData={fmtProducts}
             style={{ top: 20 }}
             width={660}
             fsTableDataSource={mproduct.list}
@@ -359,7 +395,7 @@ export default class CreateOrder extends Component {
           />
         </Card>
         <FooterToolbar>
-          <Button>取消</Button>
+          <Button onClick={this.handlePageCancel}>取消</Button>
           <Button type="primary">支付</Button>
         </FooterToolbar>
       </PageHeaderLayout>

src/routes/Resource/gallery/modal.js

@@ -36,6 +36,7 @@ export default class ModalForm extends PureComponent {
       form: {
         validateFields,
         getFieldsValue,
+        resetFields,
       },
       item,
       onOk,
@@ -54,12 +55,15 @@ export default class ModalForm extends PureComponent {
         data.type = Codes.CODE_IMAGE;  // 创建图片，默认类型type=3
       }
       onOk(data);
+      resetFields();
     });
   }
 
   handleCancel = () => {
-    const { onCancel } = this.props;
+    const { onCancel, form } = this.props;
+    const { resetFields } = form;
     onCancel();
+    resetFields();
   }
 
   render() {

src/routes/Resource/gallery/search.js

@@ -27,7 +27,7 @@ export default class Search extends PureComponent {
         value: 'code', name: '图片编号'
       }],
       selectProps: {
-        defaultValue: field || 'name',
+        defaultValue: field || 'code',
       },
       onSearch: (value) => {
         onSearch(value);

src/routes/Resource/video/table.js

@@ -65,8 +65,6 @@ export default class TableList extends PureComponent {
       render: (text, record) => (
         <div>
           <a onClick={() => onPlayVideo(record)}>播放</a>
-          <Divider type="vertical" />
-          <a onClick={() => this.handleDeleteItem(record)}>{record.status === Codes.CODE_NORMAL ? '删除' : '恢复'}</a>
         </div>
       )
     }];

src/routes/Resource/video/table.less

@@ -18,7 +18,7 @@
         }
 
         &:nth-child(2) {
-          width: 20%;
+          width: 23%;
         }
 
         &:nth-child(3) {
@@ -38,7 +38,7 @@
         }
 
         &:nth-child(7) {
-          width: 13%;
+          width: 10%;
         }
       }
 

src/routes/Support/Edit/index.js

@@ -52,7 +52,6 @@ export default class SupportDetail extends PureComponent {
           payload: {
             pageNo: 1,
             pageSize: 10,
-            status: Codes.CODE_NORMAL,
           }
         });
       }
@@ -63,7 +62,6 @@ export default class SupportDetail extends PureComponent {
           payload: {
             pageNo: 1,
             pageSize: 10,
-            status: Codes.CODE_NORMAL,
             type: Codes.CODE_IMAGE,
           }
         });
@@ -107,12 +105,10 @@ export default class SupportDetail extends PureComponent {
     const newData = { ...data };
     if (newData.keyword) {
       newData[newData.field] = newData.keyword;
-      delete newData.field;
-      delete newData.keyword;
-    } else {
-      delete newData.field;
-      delete newData.keyword;
     }
+    delete newData.field;
+    delete newData.keyword;
+
     if (curClickedBtn === 'supportBtn') {
       dispatch({
         type: `support/query`,
@@ -222,7 +218,7 @@ export default class SupportDetail extends PureComponent {
 
   handlePageCancel = () => {
     const { dispatch, supportDetail: { filters } } = this.props;
-    dispatch({ type: 'supportDetail/clearPage' });
+    dispatch({ type: 'supportDetail/initState' });
     dispatch(
       routerRedux.push({
         pathname: '/product/support',

src/routes/Tag/List/index.js

@@ -28,6 +28,7 @@ export default class Tag extends PureComponent {
         pageNo: 1,
         status: Codes.CODE_NORMAL,
         pageSize: 20,
+        domain: Codes.CODE_PJ,
       }
     });
   }

src/routes/TagGroup/Edit/index.js

@@ -127,6 +127,7 @@ export default class GroupDetail extends PureComponent {
       title: '位置',
       dataIndex: 'sort',
       key: 'sort',
+      render: (text, record, index) => index + 1,
     },{
       title: '标签名称',
       dataIndex: 'name',
@@ -139,11 +140,11 @@ export default class GroupDetail extends PureComponent {
         const statusMap = {[Codes.CODE_NORMAL]: 'success', [Codes.CODE_DELETE]: 'error'};
         return (<Badge status={statusMap[record.status]} text={statuses[record.status]} />);
       },
-    },{
-      title: '标签类型',
-      dataIndex: 'type',
-      key: 'type',
-      render: (text, record) => (<span>{tagType[record.type]}</span>),
+    // },{
+    //   title: '标签类型',
+    //   dataIndex: 'type',
+    //   key: 'type',
+    //   render: (text, record) => (<span>{tagType[record.type]}</span>),
     }];
 
     const formItemLayout = {

src/routes/TagGroup/Edit/modal.js

@@ -30,6 +30,7 @@ export default class TagSortModal extends PureComponent {
         title: '位置',
         dataIndex: 'sort',
         key: 'sort',
+        render: (text, record, index) => index + 1,
       },{
         title: '标签名称',
         dataIndex: 'name',
@@ -42,11 +43,11 @@ export default class TagSortModal extends PureComponent {
           const statusMap = {[Codes.CODE_NORMAL]: 'success', [Codes.CODE_DELETE]: 'error'};
           return (<Badge status={statusMap[record.status]} text={statuses[record.status]} />);
         },
-      },{
-        title: '标签类型',
-        dataIndex: 'type',
-        key: 'type',
-        render: (text, record) => (<span>{tagType[record.type]}</span>),
+      // },{
+      //   title: '标签类型',
+      //   dataIndex: 'type',
+      //   key: 'type',
+      //   render: (text, record) => (<span>{tagType[record.type]}</span>),
       }],
     };
 

src/routes/TagGroup/List/index.js

@@ -28,7 +28,6 @@ export default class TagGroup extends PureComponent {
         pageNo: 1,
         pageSize: 20,
         domain: Codes.CODE_PJ,
-        status: Codes.CODE_NORMAL,
       }
     });
   }

src/routes/TagGroup/List/search.js

@@ -28,7 +28,7 @@ export default class Search extends PureComponent {
         value: 'code', name: '标签组编号', mode: 'input',
       }],
       selectProps: {
-        defaultValue: field || 'name',
+        defaultValue: field || 'code',
       },
       onSearch: (value) => {
         onSearch(value);

src/routes/TagGroup/List/table.js

@@ -17,7 +17,7 @@ export default class TableList extends PureComponent {
       onOk () {
         if (record.status === Codes.CODE_NORMAL) {
           onDeleteItem({id: record.id});
-        } else if (record.status === Codes.CODE_DELETE) {
+        } else {
           onRecoverItem({ id: record.id, status: Codes.CODE_NORMAL });
         }
       },

src/routes/Ware/Edit/index.js

@@ -121,15 +121,23 @@ export default class WareDetail extends PureComponent {
     validateFields((errors) => {
       if (errors) return;
 
-      const { id, status, resourceList } = currentItem;
-      const data = {...getFieldsValue()}
+      // 删除不必要字段或者需处理字段(resourceList)
+      const { gmtCreated, gmtModified, resourceList, ...rest } = currentItem;
+
+      // 获取全部表单数据及接口数据
+      const data = {
+        ...rest,
+        ...getFieldsValue(),
+      };
+
+      // resourceList为idList
       data.resourceList = (resourceList || []).map(item => item.id);
+
+      // 创建课件状态为normal
       if (operType === 'create') {
         data.status = Codes.CODE_NORMAL;
-      } else if (operType === 'update') {
-        data.id = id;
-        data.status = status;
       }
+
       dispatch({
         type: `wareDetail/${operType}`,
         payload: data,
@@ -148,7 +156,7 @@ export default class WareDetail extends PureComponent {
 
   handlePageCancel = () => {
     const { dispatch, wareDetail: { filters } } = this.props;
-    dispatch({ type: 'wareDetail/clearPage' });
+    dispatch({ type: 'wareDetail/initState' });
     dispatch(
       routerRedux.push({
         pathname: '/product/ware',

src/routes/Ware/List/table.js

@@ -35,10 +35,10 @@ export default class TableList extends PureComponent {
       title: '课件名称',
       dataIndex: 'name',
       key: 'name',
-    },{
-      title: '供应商',
-      dataIndex: 'cpId',
-      key: 'cpId',
+    // },{
+    //   title: '供应商',
+    //   dataIndex: 'cpId',
+    //   key: 'cpId',
     },{
       title: '状态',
       dataIndex: 'status',
@@ -51,11 +51,11 @@ export default class TableList extends PureComponent {
       filterMultiple: false,
       filteredValue: [curStatus],
     },{
-      title: '添加时间',
-      dataIndex: 'gmtCreated',
-      key: 'gmtCreated',
+      title: '修改时间',
+      dataIndex: 'gmtModified',
+      key: 'gmtModified',
       render: (text, record) => (
-        <div>{moment(text).format('YYYY-MM-DD')}</div>
+        <div>{moment(text).format('YYYY-MM-DD HH:mm:ss')}</div>
       )
     },{
       title: '操作',

src/routes/Ware/List/table.less

@@ -14,26 +14,26 @@
       .ant-table-tbody > tr > td,
       .ant-table-thead > tr > th {
         &:nth-child(1) {
-          width: 17%;
+          width: 25%;
         }
 
         &:nth-child(2) {
-          width: 17%;
+          width: 25%;
         }
 
+        // &:nth-child(3) {
+        //   width: 17%;
+        // }
+        //
         &:nth-child(3) {
-          width: 17%;
+          width: 15%;
         }
 
         &:nth-child(4) {
-          width: 17%;
+          width: 20%;
         }
 
         &:nth-child(5) {
-          width: 17%;
-        }
-
-        &:nth-child(6) {
           width: 15%;
         }
       }

src/services/lesson.js

@@ -7,7 +7,7 @@ export async function query(params) {
 }
 
 export async function queryOne({ id }) {
-  return request(`${lesson.replace('/:id', `/${id}`)}`);
+  return request(`${lesson}/${id}`);
 }
 
 export async function create(params) {
@@ -15,7 +15,7 @@ export async function create(params) {
     method: 'POST',
     body: JSON.stringify(params),
   };
-  return request(`${lesson.replace('/:id', '')}`, options);
+  return request(`${lesson}`, options);
 }
 
 export async function update(params) {
@@ -23,10 +23,10 @@ export async function update(params) {
     method: 'PUT',
     body: JSON.stringify(params),
   };
-  return request(`${lesson.replace('/:id', '')}`, options);
+  return request(`${lesson}`, options);
 }
 
 export async function remove({ id }) {
   const options = { method: 'DELETE' }
-  return request(`${lesson.replace('/:id', `/${id}`)}`, options);
+  return request(`${lesson}/${id}`, options);
 }

src/utils/api.js

@@ -15,18 +15,15 @@ module.exports = {
   merchants: `${config.apiHost}/merchant/list`,
   merchant: `${config.apiHost}/merchant`,
   recommend: `${config.apiHost}/merchant/recommend`,
-  // 标签组及标签
   groups: `${config.apiHost}/group/list`,
   group: `${config.apiHost}/group`,
   tags: `${config.apiHost}/tag/list`,
   tag: `${config.apiHost}/tag`,
-  // 课件/课
   wares: `${config.apiHost}/ware/list`,
   ware: `${config.apiHost}/ware`,
   lessons: `${config.apiHost}/lesson/list`,
-  lesson: `${config.apiHost}/lesson/:id`,
+  lesson: `${config.apiHost}/lesson`,
   product: `${config.apiHost}/product`,
-  // 渠道产品接口
   merchantProducts: `${config.apiHost}/merchant/product`,
   merchantProduct: `${config.apiHost}/merchant/product/detail`,
   merchantProductCreate: `${config.apiHost}/merchant/product/status`,

src/utils/helper.js

@@ -27,7 +27,7 @@ export function getLocalUser() {
 export function getLocalToken() {
   const localUser = window.localStorage.getItem('LJ@2B#CMS!User');
   if (localUser && localUser !== 'undefined') {
-    return JSON.parse(localUser).token;
+    return JSON.parse(localUser)['X-Token'];
   }
 }
 

src/utils/request.js

@@ -2,7 +2,6 @@ import fetch from 'dva/fetch';
 import { stringify } from 'qs';
 import { message, notification } from 'antd';
 import { routerRedux } from 'dva/router';
-import { getLocalToken } from './helper';
 import store from '../index';
 
 // HTTP响应状态码
@@ -102,14 +101,12 @@ export default function request(url, options) {
     newOptions.headers = {
       'Accept': 'application/json',
       'Content-Type': 'application/json; charset=utf-8',
-      'X-Token': getLocalToken(),
       ...newOptions.headers,
     };
   }
   else {
     newOptions.headers = {
       'Accept': 'application/json',
-      'X-Token': getLocalToken(),
       ...newOptions.headers,
     }
   }