产品接口调整

src/models/combo/combo.js

@@ -33,7 +33,7 @@ export default modelExtend(pageModel, {
   effects: {
     * query ({ payload = {} }, { call, put }) {
       yield put({ type: 'changeLoading', payload: { listLoading: true }});
-      const { data, success } = yield call(query, payload);
+      const { data, success } = yield call(query, { ...payload, type: Codes.CODE_PACKAGE });
       if (success) {
         yield put({
           type: 'querySuccess',

src/models/combo/detail.js

@@ -1,4 +1,4 @@
-import { queryOne, createPackage, updatePackage } from '../../services/product';
+import { queryOne, create, update } from '../../services/product';
 import { message } from 'antd';
 import pathToRegexp from 'path-to-regexp';
 import { Codes } from '../../utils/config';
@@ -37,21 +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 }) {
-      const { data, success } = yield call(createPackage, payload);
+      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(updatePackage, payload);
+      const { data, success } = yield call(update, payload);
       if (success) {
-        yield put({ type: 'clearPage' });
+        message.success('创建失败!');
+        yield put({ type: 'initState' });
         if (callback) callback();
       }
     }
@@ -61,19 +63,15 @@ export default {
     changeLoading(state, { payload }) {
       return { ...state, ...payload };
     },
-
     querySuccess(state, { payload }) {
       return { ...state, currentItem: payload };
     },
-
     saveFilters(state, { payload: filters }) {
       return { ...state, filters };
     },
-
     saveOperType(state, { payload }) {
       return { ...state, ...payload };
     },
-
     saveProducts(state, action) {
       return {
         ...state,
@@ -84,7 +82,6 @@ export default {
         modalShow: false,
       };
     },
-
     savePrice(state, action) {
       return {
         ...state,
@@ -94,16 +91,13 @@ export default {
         },
       };
     },
-
     showModal(state, action) {
       return { ...state, ...action.payload, modalShow: true };
     },
-
     hideModal(state, action) {
       return { ...state, ...action.payload, modalShow: false };
     },
-
-    clearPage(state) {
+    initState(state) {
       return { ...state, currentItem: {}, itemLoading: false };
     }
   }

src/models/course/course.js

@@ -1,3 +1,4 @@
+import { message } from 'antd';
 import { query, update, remove } from '../../services/product';
 import modelExtend from 'dva-model-extend';
 import queryString from 'query-string';
@@ -9,9 +10,7 @@ import { Codes } from '../../utils/config';
 export default modelExtend(pageModel, {
   namespace: 'course',
 
-  state: {
-    listLoading: false,
-  },
+  state: { listLoading: false },
 
   subscriptions: {
     setup({ dispatch, history }) {
@@ -46,12 +45,14 @@ export default modelExtend(pageModel, {
     * delete ({ payload, callback }, { call, put }) {
       const { data, success } = yield call(remove, payload);
       if (success) {
+        message.success('删除成功!');
         if (callback) callback();
       }
     },
     * recover ({ payload, callback }, { call, put }) {
       const { data, success } = yield call(update, payload);
       if (success) {
+        message.success('恢复成功!');
         if (callback) callback();
       }
     },

src/models/course/detail.js

@@ -1,3 +1,4 @@
+import { message } from 'antd';
 import { queryOne, create, update } from '../../services/product';
 import pathToRegexp from 'path-to-regexp';
 import { Codes } from '../../utils/config';
@@ -38,23 +39,24 @@ 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('修改成功!');
         if (callback) callback();
+        yield put({ type: 'initState' });
       }
     }
   },
@@ -63,64 +65,50 @@ export default {
     changeLoading(state, { payload }) {
       return { ...state, ...payload };
     },
-
     querySuccess(state, { payload }) {
       return { ...state, currentItem: payload };
     },
-
     saveFilters(state, { payload: filters }) {
       return { ...state, filters };
     },
-
     showLessonModal(state, { payload }) {
       return { ...state, ...payload, lessonModalVisible: true };
     },
-
     hideLessonModal(state) {
       return { ...state, lessonModalVisible: false };
     },
-
     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 };
     },
-
     saveOperType(state, { payload }) {
       return { ...state, ...payload };
     },
-
     saveCoverImg(state, { payload: { coverUrl } }) {
       const currentItem = { ...state.currentItem, coverUrl };
       return { ...state, resourceModalVisible: false, currentItem };
     },
-
     saveBackgroundImg(state, { payload: { bgUrl } }) {
       const currentItem = { ...state.currentItem, bgUrl };
       return { ...state, resourceModalVisible: false, currentItem };
     },
-
     saveLessonList(state, { payload: { subItemList } }) {
       const currentItem = { ...state.currentItem, subItemList };
       return { ...state, lessonModalVisible: false, currentItem };
     },
-
     saveSupportList(state, { payload: { supportList } }) {
       const currentItem = { ...state.currentItem, supportList };
       return { ...state, supportModalVisible: false, currentItem };
     },
-
-    clearPage(state) {
+    initState(state) {
       return { ...state, currentItem: {}, itemLoading: false };
     }
   }

src/models/order/detail.js

@@ -39,14 +39,14 @@ export default {
     * create ({ payload, callback }, { call, put }) {
       const { data, success } = yield call(create, { ...payload });
       if (success) {
-        yield put({ type: 'cacheCleaner' });
+        yield put({ type: 'initState' });
         if (callback) callback();
       }
     },
     * update ({ payload, callback }, { call, put }) {
       const { data, success } = yield call(update, payload);
       if (success) {
-        yield put({ type: 'cacheCleaner' });
+        yield put({ type: 'initState' });
         if (callback) callback();
       }
     }
@@ -68,27 +68,27 @@ export default {
     hideTerminalModal(state, action) {
       return { ...state, ...action.payload, terminalModalShow: false };
     },
-    savePickedTerminal(state, action) {
-      return {
-        ...state,
-        currentItem: { ...state.currentItem, ...action.payload },
-        terminalModalShow: false,
-      };
-    },
     showProductModal(state, action) {
       return { ...state, ...action.payload, productModalShow: true };
     },
     hideProductModal(state, action) {
       return { ...state, ...action.payload, productModalShow: false };
     },
-    savePickedProducts(state, action) {
-      return {
-        ...state,
-        currentItem: { goods: action.payload },
-        productModalShow: false,
-      };
-    },
-    cacheCleaner(state) {
+    // savePickedTerminal(state, action) {
+    //   return {
+    //     ...state,
+    //     currentItem: { ...state.currentItem, ...action.payload },
+    //     terminalModalShow: false,
+    //   };
+    // },
+    // savePickedProducts(state, action) {
+    //   return {
+    //     ...state,
+    //     currentItem: { goods: action.payload },
+    //     productModalShow: false,
+    //   };
+    // },
+    initState(state) {
       return { ...state, currentItem: {}, itemLoading: false };
     }
   }

src/models/resource.js

@@ -1,8 +1,9 @@
+import { message } from 'antd';
 import { query, remove, update, create, getSignature } from '../services/resource';
 import modelExtend from 'dva-model-extend';
 import queryString from 'query-string';
 import { pageModel } from './common';
-import config from '../utils/config';
+import { pageSize } from '../utils/config';
 import { checkSearchParams } from '../utils/utils';
 
 export default modelExtend(pageModel, {
@@ -51,7 +52,7 @@ export default modelExtend(pageModel, {
             list: data.list,
             pagination: {
               current: Number(payload.pageNo) || 1,
-              pageSize: Number(payload.pageSize) || config.pageSize,
+              pageSize: Number(payload.pageSize) || pageSize,
               total: data.totalSize,
             }
           }
@@ -62,26 +63,30 @@ export default modelExtend(pageModel, {
     * create ({ payload, callback }, { call, put }) {
       const { data, success } = yield call(create, payload);
       if (success) {
-        yield put({ type: 'hideModal' });
+        message.success('创建成功!');
         if (callback) callback();
+        yield put({ type: 'hideModal' });
       }
     },
     * update ({ payload, callback }, { call, put }) {
       const { data, success } = yield call(update, payload);
       if (success) {
-        yield put({ type: 'hideModal' });
+        message.success('修改成功!');
         if (callback) callback();
+        yield put({ type: 'hideModal' });
       }
     },
     * delete ({ payload, callback }, { call, put }) {
       const { data, success } = yield call(remove, payload);
       if (success) {
+        message.success('删除成功!');
         if (callback) callback();
       }
     },
     * recover ({ payload, callback }, { call, put }) {
       const { data, success } = yield call(update, payload);
       if (success) {
+        message.success('恢复成功!');
         if (callback) callback();
       }
     },

src/models/support/detail.js

@@ -1,4 +1,5 @@
-import { queryOne, create, update } from '../../services/support';
+import { message } from 'antd';
+import { queryOne, create, update } from '../../services/product';
 import pathToRegexp from 'path-to-regexp';
 import { Codes } from '../../utils/config';
 
@@ -37,23 +38,24 @@ 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('修改成功!');
         if (callback) callback();
+        yield put({ type: 'initState' });
       }
     }
   },
@@ -62,46 +64,36 @@ 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 };
     },
-
     saveOperType(state, { payload }) {
       return { ...state, ...payload };
     },
-
-    clearPage(state) {
+    initState(state) {
       return { ...state, currentItem: {}, itemLoading: false };
     }
   }

src/routes/Course/Edit/index.js

@@ -196,8 +196,8 @@ export default class CourseDetail extends PureComponent {
     validateFields((errors) => {
       if (errors) { return; }
 
-      // 过滤掉gmtCreated, gmtModified, status三个字段
-      const { subItemList, supportList, gmtCreated, gmtModified, status, ...rest } = currentItem;
+      // 过滤掉gmtCreated, gmtModified
+      const { subItemList, supportList, gmtCreated, gmtModified, ...rest } = currentItem;
       let newSubItemList;
       let newSupportList;
       // 如果subItemList是个list且内容不为空
@@ -208,7 +208,7 @@ export default class CourseDetail extends PureComponent {
       }
       // 如果supportList是个list且内容不为空
       if (Array.isArray(supportList) && supportList.length) {
-        newSupportList = supportList.map(item => ({ id: item.id, type: Codes.CODE_SUPPORT}));
+        newSupportList = supportList.map(item => item.id);
       } else {
         newSupportList = [];
       }
@@ -221,6 +221,12 @@ export default class CourseDetail extends PureComponent {
         supportList: newSupportList,
       };
 
+      // 加入状态/id
+      if (operType == 'create') {
+        data.type = Codes.CODE_COURSE;
+        data.status = Codes.CODE_NORMAL;
+      }
+
       // 操作成功要返回列表页，同时要保持列表页的过滤数据
       dispatch({
         type: `courseDetail/${operType}`,
@@ -232,9 +238,9 @@ export default class CourseDetail extends PureComponent {
               search: queryString.stringify(filters),
             })
           );
+          resetFields();
         }
       })
-      resetFields();
     });
   }
 

src/routes/Course/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/Course/List/table.js

@@ -15,9 +15,9 @@ export default class TableList extends PureComponent {
     Modal.confirm({
       title: `您确定要${record.status === Codes.CODE_NORMAL ? '删除' : '恢复'}该课程?`,
       onOk () {
-        if (record.status === Codes.CODE_NORMAL) {
-          onDeleteItem({id: record.id});
-        } else if (record.status === Codes.CODE_DELETE) {
+        if (record.status == Codes.CODE_NORMAL) {
+          onDeleteItem({ id: record.id });
+        } else {
           onRecoverItem({ id: record.id, status: Codes.CODE_NORMAL });
         }
       },
@@ -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,24 +1,40 @@
 import React, { Component } from 'react';
-import { Popover, Modal, Card, List, Form, Table, Button, Input, InputNumber, Radio, Dropdown, Menu, Icon } from 'antd';
 import { connect } from 'dva';
 import { routerRedux } from 'dva/router';
+import {
+  Popover,
+  Modal,
+  Card,
+  List,
+  Form,
+  Table,
+  Button,
+  Input,
+  InputNumber,
+  Select,
+  Icon,
+} from 'antd';
 
 import PageHeaderLayout from '../../../layouts/PageHeaderLayout';
 import FooterToolbar from '../../../components/FooterToolbar';
 import TerminalSelectModal from './terminal';
 import MerchantProductSelectModal from './product';
-import { productType, pageSize } from '../../../utils/config';
+import { productType, pageSize, Codes } from '../../../utils/config';
 import styles from './index.less';
 
 @Form.create()
 @connect(state => ({
   terminal: state.terminal,
-  orderItem: state.orderDetail,
+  orderDetail: state.orderDetail,
   mproduct: state.mproduct,
 }))
 export default class CreateOrder extends Component {
+  state = {
+    userInfo: {}, //记录终端用户信息
+    products: [], //记录选择的产品
+  };
 
-  // 终端选择弹框相关的回调方法
+  // 终端选择弹框,显示 -> 加载数据
   handleTerminalSelectBtnClick = () => {
     this.props.dispatch({ type: 'orderDetail/showTerminalModal' });
     this.props.dispatch({
@@ -30,15 +46,28 @@ export default class CreateOrder extends Component {
     });
   }
 
+  // 选择终端
   handleTerminalModalOk = (record) => {
-    this.props.dispatch({
-      type: 'orderDetail/savePickedTerminal',
-      payload: {
+    // this.props.dispatch({
+    //   type: 'orderDetail/savePickedTerminal',
+    //   payload: {
+    //     userCode: record.code,
+    //     userName: record.name,
+    //     campusName: record.campusName,
+    //     merchantName: record.merchantName,
+    //     merchantId: record.merchantId,
+    //   }
+    // });
+    this.setState({
+      userInfo: {
         userCode: record.code,
         userName: record.name,
         campusName: record.campusName,
         merchantName: record.merchantName,
         merchantId: record.merchantId,
+        contactName: record.contactName,
+        mobile: record.mobile,
+        address: record.address,
       }
     });
   }
@@ -55,10 +84,10 @@ export default class CreateOrder extends Component {
 
   }
 
-  // 产品选择弹框相关的回调方法
+  // 产品选择弹框
   handleProductSelectBtnClick = () => {
-    const { orderItem } = this.props;
-    const { currentItem } = orderItem;
+    const { orderDetail } = this.props;
+    const { currentItem } = orderDetail;
     const { merchantId } = currentItem;
     this.props.dispatch({ type: 'orderDetail/showProductModal' });
     this.props.dispatch({
@@ -79,11 +108,13 @@ export default class CreateOrder extends Component {
 
   }
 
+  // 选择产品
   handleProductModalOk = (data) => {
-    this.props.dispatch({
-      type: 'orderDetail/savePickedProducts',
-      payload: data,
-    });
+    // this.props.dispatch({
+    //   type: 'orderDetail/savePickedProducts',
+    //   payload: data,
+    // });
+    this.setState({ products: data || [] });
   }
 
   handleProductModalCancel = () => {
@@ -96,76 +127,32 @@ export default class CreateOrder extends Component {
     });
   }
 
+  /**
+   * @desc 对返回的单个订单数据进行加工，方便在table中进行展示及编辑
+   * @param {Object}
+   * @return {Object}
+   */
+  renderTableList = (data) => {
+    const fomtProducts = data.map(item => {
+      if (item.contents) {
+        item.children = item.contents;
+        delete item.contents;
+      }
+      if (item.goods && item.goods.length) {
+        item.goods.map((goodsItem, index) => {
+          if (index == 0) {
+            item.goods[index].selected = true;
+          }
+        })
+      }
+    });
+  }
+
   render() {
-    const { orderItem, terminal, mproduct, form } = this.props;
-    const { terminalModalShow, productModalShow } = orderItem;
-    const currentItem = {
-      userCode: '15790324883489',
-      userName: '教室六',
-      campusName: '北京-北京市 西城区-科贸A座',
-      merchantName: '贝尔安亲',
-      merchantId: '555',
-      products: [{
-        id: 'p1',
-        code: 'P-01',
-        name: '语文一年级上册',
-        type: 'COURSE',
-        coverUrl: 'https://os.alipayobjects.com/rmsportal/QBnOOoLaAfKPirc.png',
-        goods: [{
-          id: '1',
-          chargeUnit: '年',
-          cpPrice: 2000,
-          merchantPrice: 3000,
-          terminalPrice: 4000,
-        },{
-          id: '2',
-          chargeUnit: '半年',
-          cpPrice: 1000,
-          merchantPrice: 2000,
-          terminalPrice: 3000,
-        },{
-          id: '3',
-          chargeUnit: '季',
-          cpPrice: 500,
-          merchantPrice: 800,
-          terminalPrice: 1000,
-        }],
-      },{
-        id: 'package-1',
-        code: '课程包-01',
-        name: '小学一年级语文课程包',
-        type: 'PACKAGE',
-        coverUrl: 'https://os.alipayobjects.com/rmsportal/QBnOOoLaAfKPirc.png',
-        goods: [],
-        children: [{
-          id: 'p1',
-          code: 'P-01',
-          name: '语文一年级上册',
-          type: 'COURSE',
-          coverUrl: 'https://os.alipayobjects.com/rmsportal/QBnOOoLaAfKPirc.png',
-          goods: [{
-            id: '1',
-            chargeUnit: '年',
-            cpPrice: 2000,
-            merchantPrice: 3000,
-            terminalPrice: 4000,
-          },{
-            id: '2',
-            chargeUnit: '半年',
-            cpPrice: 1000,
-            merchantPrice: 2000,
-            terminalPrice: 3000,
-          },{
-            id: '3',
-            chargeUnit: '季',
-            cpPrice: 500,
-            merchantPrice: 800,
-            terminalPrice: 1000,
-          }],
-        }],
-      }],
-    };
-    const { userCode, userName, campusName, merchantName, merchantId, products } = currentItem;
+    const { orderDetail, terminal, mproduct, form } = this.props;
+    const { userInfo, products } = this.state;
+    const { getFieldDecorator } = form;
+    const { terminalModalShow, productModalShow } = orderDetail;
 
     const formItemLayout = {
       labelCol: {
@@ -181,89 +168,101 @@ export default class CreateOrder extends Component {
 
     const columns = [{
       title: '序号',
-      dataIndex: 'sort',
-      key: 0,
       render: (text, record, index) => index + 1,
-    },{
-      title: '图片',
-      dataIndex: 'coverUrl',
-      key: 1,
-      render: (text, record) => (
-        <Popover
-          content={
-            <Card hoverable style={{ width: 250, height: 400 }} cover={<img alt="" src={text}/>}>
-              <Card.Meta
-                title={`${record.name}/${record.code}`}
-                description={`类型: ${productType[record.type]}`}
-              />
-            </Card>
-          }
-        >
-          <img src={text} width={50} />
-        </Popover>
-      ),
+      width: '6%',
+      key: 0,
     },{
       title: '编号',
       dataIndex: 'code',
-      key: 2,
+      key: 1,
+      width: '10%',
     },{
       title: '名称',
       dataIndex: 'name',
-      key: 3,
+      key: 2,
+      width: '10%',
     },{
       title: '类型',
       dataIndex: 'type',
-      key: 4,
+      key: 3,
       render: (text) => productType[text],
+      width: '6%',
     },{
       title: '价格类型',
       dataIndex: 'goods',
+      key: 4,
+      render: (text, record) => {
+        if (!record.isChild) {
+          return (
+            <Select>
+              {record.goods.map(item => <Select.Option key={item.id}>{`¥${item.terminalPrice} / ${item.chargeUnit}`}</Select.Option>)}
+            </Select>
+          );
+        } else {
+          return '-';
+        }
+      },
+      width: '15%',
+    },{
+      title: '供应商售价',
+      dataIndex: 'cpPrice',
       key: 5,
-      render: (text, record) => (
-        <Dropdown
-          overlay={
-            <Menu>
-              {record.goods.map(item => <Menu.Item key={item.id}>{`¥${item.terminalPrice} / ${item.chargeUnit}`}</Menu.Item>)}
-            </Menu>
-          }
-        ><a>付费方式<Icon type="down" /></a>
-        </Dropdown>
-      ),
+      width: '10%',
     },{
-      title: '优惠价格',
-      dataIndex: 'adjustPrice',
+      title: '领教售价',
+      dataIndex: 'merchantPrice',
       key: 6,
-      render: (text, record) => (
-        <InputNumber
-          min={0}
-          defaultValue={0}
-          formatter={value => `¥ ${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')}
-          parser={value => value.replace(/\¥\s?|(,*)/g, '')}
-        />
-      ),
+      width: '10%',
     },{
-      title: '实际售价',
-      dataIndex: 'finalPrice',
+      title: '渠道售价',
+      dataIndex: 'terminalPrice',
       key: 7,
+      render: (text, record) => {
+        if (!record.isChild) {
+          return text;
+        } else {
+          return '-';
+        }
+      },
+      width: '10%',
     },{
       title: '数量',
       dataIndex: 'quantity',
       key: 8,
-      render: (text, record) => (
-        <InputNumber
-          min={1}
-          defaultValue={1}
-          formatter={value => `x ${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')}
-          parser={value => value.replace(/\x\s?|(,*)/g, '')}
-        />
-      ),
+      render: (text, record) => {
+        if (!record.isChild || record.type == Codes.CODE_SUPPORT) {
+          return (
+            <InputNumber
+              min={1}
+              defaultValue={1}
+              formatter={value => `x ${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')}
+              parser={value => value.replace(/\x\s?|(,*)/g, '')}
+            />
+          );
+        } else {
+          return '-';
+        }
+      },
+      width: '6%',
+    },{
+      title: '小计',
+      key: 9,
+      render: (text, record, index) => {
+
+      },
+      width: '10%',
     },{
       title: '操作',
       dataIndex: 'operation',
-      key: 9,
-      render: (text, record) => (
-        <a onClick={() => this.handleListItemDel(record)}>删除</a>
-      )
+      key: 10,
+      render: (text, record) => {
+        if (!record.isChild) {
+          return <a onClick={() => this.handleListItemDel(record)}>删除</a>;
+        } else {
+          return;
+        }
+      },
+      width: '7%',
     }];
 
     return (
@@ -272,32 +271,60 @@ export default class CreateOrder extends Component {
           <Form>
             <Form.Item label="选择终端" {...formItemLayout}>
               <Button onClick={this.handleTerminalSelectBtnClick} type="primary" size="small" icon="plus-circle-o">选择</Button>
-              {userCode ?
+              {userInfo.userCode ?
                 <List
                   size="small"
                   bordered
                   style={{ width: '50%' }}
-                  dataSource={[`终端编号: ${userCode}`, `终端名称: ${userName}`, `所属校区: ${campusName}`, `所属渠道: ${merchantName}`]}
+                  dataSource={[
+                    `终端编号: ${userInfo.userCode}`,
+                    `终端名称: ${userInfo.userName}`,
+                    `所属校区: ${userInfo.campusName}`,
+                    `所属渠道: ${userInfo.merchantName}`,
+                  ]}
                   renderItem={item => <List.Item>{item}</List.Item>}
                 />
               : null}
             </Form.Item>
+            <Form.Item label="收货人" {...formItemLayout}>
+              {getFieldDecorator('contactName', {
+                rules: [{ required: true, type: 'string', message: '请填写收货人!' }],
+                initialValue: userInfo.contactName,
+              })(
+                <Input style={{ width: "50%" }} placeholder="请填写或使用默认"/>
+              )}
+            </Form.Item>
+            <Form.Item label="联系电话" {...formItemLayout}>
+              {getFieldDecorator('mobile', {
+                rules: [{ required: true, type: 'string', message: '请填写联系电话!' }],
+                initialValue: userInfo.mobile,
+              })(
+                <Input style={{ width: "50%" }} placeholder="请填写或使用默认"/>
+              )}
+            </Form.Item>
             <Form.Item label="收货地址" {...formItemLayout}>
-              <Input.TextArea style={{ width: "50%" }} placeholder="请填写或使用默认地址"/>
+              {getFieldDecorator('address', {
+                rules: [{ required: true, type: 'string', message: '请填写收货地址!' }],
+                initialValue: userInfo.address,
+              })(
+                <Input.TextArea style={{ width: "50%" }} placeholder="请填写或使用默认"/>
+              )}
             </Form.Item>
             <Form.Item label="添加备注" {...formItemLayout}>
-              <Input.TextArea style={{ width: "50%" }} placeholder="请输入(选填)" />
+              {getFieldDecorator('note', {
+                initialValue: userInfo.note,
+              })(
+                <Input.TextArea style={{ width: "50%" }} placeholder="请输入(选填)" />
+              )}
             </Form.Item>
             <Form.Item label="添加商品" {...formItemLayout}>
-              <Button onClick={this.handleProductSelectBtnClick} disabled={merchantId ? false : true} type="primary" size="small" icon="plus-circle-o">添加</Button>
+              <Button onClick={this.handleProductSelectBtnClick} disabled={userInfo.merchantId ? false : true} type="primary" size="small" icon="plus-circle-o">添加</Button>
               <Table
-                bordered
-                size="large"
-                scroll={{ x: 1200 }}
+                scroll={{ x: 1300 }}
                 rowKey={record => record.id}
                 pagination={false}
                 columns={columns}
-                dataSource={products}
+                dataSource={goodsList}
               />
             </Form.Item>
           </Form>
@@ -319,7 +346,7 @@ export default class CreateOrder extends Component {
           <MerchantProductSelectModal
             rowKeyName="id"
             modalVisible={productModalShow}
-            selTableData={products || []}
+            selTableData={goodsList || []}
             style={{ top: 20 }}
             width={660}
             fsTableDataSource={mproduct.list}
@@ -333,7 +360,7 @@ export default class CreateOrder extends Component {
         </Card>
         <FooterToolbar>
           <Button>取消</Button>
-          <Button type="primary">完成</Button>
+          <Button type="primary">支付</Button>
         </FooterToolbar>
       </PageHeaderLayout>
     );

src/routes/Support/Edit/index.js

@@ -173,10 +173,37 @@ export default class SupportDetail extends PureComponent {
     } = this.props;
     validateFields((errors) => {
       if (errors) { return; }
+
+      // 过滤掉gmtCreated, gmtModified, status三个字段
+      const { supportList, imgList, gmtCreated, gmtModified, ...rest } = currentItem;
+      let newImgList;
+      let newSupportList;
+      if (Array.isArray(imgList) && imgList.length) {
+        newImgList = imgList.map(item => item.id);
+      } else {
+        newImgList = [];
+      }
+      // 如果supportList是个list且内容不为空
+      if (Array.isArray(supportList) && supportList.length) {
+        newSupportList = supportList.map(item => item.id);
+      } else {
+        newSupportList = [];
+      }
+
+      // 最终提交的数据
       const data = {
-        ...currentItem,
+        ...rest,
         ...getFieldsValue(),
+        imgList: newImgList,
+        supportList: newSupportList,
       };
+
+      // 其他参数
+      if (operType == 'create') {
+        data.type = Codes.CODE_SUPPORT;
+        data.status = Codes.CODE_NORMAL;
+      }
+
       dispatch({
         type: `supportDetail/${operType}`,
         payload: data,
@@ -187,9 +214,9 @@ export default class SupportDetail extends PureComponent {
               search: queryString.stringify(filters),
             })
           );
+          resetFields();
         }
       })
-      resetFields();
     });
   }
 

src/routes/Support/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/Support/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/modal.js

@@ -26,7 +26,7 @@ export default class ResourceSelectSortModal extends PureComponent {
 
 
     const modalProps = {
-      title: '选择课件资源',
+      title: '选择资源',
       maskClosable: false,
       visible: modalVisible,
       onCancel,
@@ -44,7 +44,7 @@ export default class ResourceSelectSortModal extends PureComponent {
         value: 'code', name: '资源编号', mode: 'input',
       }],
       searchSelectProps: {
-        defaultValue: 'name',
+        defaultValue: 'code',
       },
       onSearch: (value) => {
         onSearch(value);

src/routes/Ware/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/Ware/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/services/combo.js

@@ -1,17 +0,0 @@
-import { stringify } from 'qs';
-import request from '../utils/request';
-import { packageList, savePackage } from '../utils/api';
-
-// export async function query(params) {
-//   return request(`${packageList}?${stringify(params)}`);
-// }
-//
-// export async function queryOne({ id }) {
-//   return request(`${packageList}`);
-// }
-//
-
-// export async function remove({ id }) {
-//   const options = { method: 'DELETE' }
-//   return request(`${combo.replace('/:id', `/${id}`)}`, options);
-// }

src/services/course.js

@@ -1,32 +0,0 @@
-import { stringify } from 'qs';
-import request from '../utils/request';
-import { courses, course } from '../utils/api';
-
-export async function query(params) {
-  return request(`${courses}?${stringify(params)}`);
-}
-
-export async function queryOne({ id }) {
-  return request(`${course.replace('/:id', `/${id}`)}`);
-}
-
-export async function create(params) {
-  const options = {
-    method: 'POST',
-    body: JSON.stringify(params),
-  };
-  return request(`${course.replace('/:id', '')}`, options);
-}
-
-export async function update(params) {
-  const options = {
-    method: 'PUT',
-    body: JSON.stringify(params),
-  };
-  return request(`${course.replace('/:id', '')}`, options);
-}
-
-export async function remove({ id }) {
-  const options = { method: 'DELETE' }
-  return request(`${course.replace('/:id', `/${id}`)}`, options);
-}

src/services/product.js

@@ -1,6 +1,6 @@
 import { stringify } from 'qs';
 import request from '../utils/request';
-import { product, savePackage } from '../utils/api';
+import { product } from '../utils/api';
 
 /**
  * @desc 获取全部产品 /product
@@ -12,32 +12,30 @@ export async function query(params) {
 /**
  * @desc 获取一个产品 /product/<productId>
  */
-export async function queryOne({ id }) {
-  return request(`${product}/${id}`);
+export async function queryOne({ pid }) {
+  return request(`${product}/${pid}`);
 }
 
 /**
  * @desc 创建一个产品
  */
-export async function create(params) {
-  const { type, ...rest } = params;
+export async function create({type, ...rest}) {
   const options = {
     method: 'POST',
     body: JSON.stringify(rest),
   };
-  return request(`${product}?type=${type}`, options);
+  return request(`${product}/${type.toLowerCase()}`, options);
 }
 
 /**
  * @desc 修改一个产品 put /product/<productId>
  */
-export async function update(params) {
-  const { id, ...rest } = params;
+export async function update({type, ...rest}) {
   const options = {
     method: 'PUT',
     body: JSON.stringify(rest),
   };
-  return request(`${product}/${id}`, options);
+  return request(`${product}/${type.toLowerCase()}`, options);
 }
 
 /**
@@ -47,25 +45,3 @@ export async function remove({ id }) {
   const options = { method: 'DELETE' }
   return request(`${product}/${id}`, options);
 }
-
-/**
- * @desc 创建课程包 post /package
- */
-export async function createPackage(params) {
-  const options = {
-    method: 'POST',
-    body: JSON.stringify(params),
-  };
-  return request(`${savePackage}`, options);
-}
-
-/**
- * @desc 修改课程包 put /package/<packageId>
- */
-export async function updatePackage({ id, ...rest }) {
-  const options = {
-    method: 'PUT',
-    body: JSON.stringify(params),
-  };
-  return request(`${savePackage}/${id}`, options);
-}

src/services/support.js

@@ -1,32 +0,0 @@
-import { stringify } from 'qs';
-import request from '../utils/request';
-import { supports, support } from '../utils/api';
-
-export async function query(params) {
-  return request(`${supports}?${stringify(params)}`);
-}
-
-export async function queryOne({ id }) {
-  return request(`${support.replace('/:id', `/${id}`)}`);
-}
-
-export async function create(params) {
-  const options = {
-    method: 'POST',
-    body: JSON.stringify(params),
-  };
-  return request(`${support.replace('/:id', '')}`, options);
-}
-
-export async function update(params) {
-  const options = {
-    method: 'PUT',
-    body: JSON.stringify(params),
-  };
-  return request(`${support.replace('/:id', '')}`, options);
-}
-
-export async function remove({ id }) {
-  const options = { method: 'DELETE' }
-  return request(`${support.replace('/:id', `/${id}`)}`, options);
-}

src/utils/api.js

@@ -25,21 +25,13 @@ module.exports = {
   ware: `${config.apiHost}/ware`,
   lessons: `${config.apiHost}/lesson/list`,
   lesson: `${config.apiHost}/lesson/:id`,
-  // 产品接口，包括：课程、周边、课程包
   product: `${config.apiHost}/product`,
-  course: `${config.apiHost}/product/course`,
-  support: `${config.apiHost}/product/support`,
-  packageList: `${config.apiHost}/product/package`,
-  savePackage: `${config.apiHost}/package`,
   // 渠道产品接口
   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`,
-  // 订单接口
   order: `${config.apiHost}/order`,
-  // 销售统计
   soldProduct: `${config.apiHost}/soldProduct`,
 };

src/utils/request.js

@@ -2,6 +2,7 @@ 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响应状态码
@@ -26,6 +27,7 @@ const httpCodeMessage = {
 // 自定义响应状态码
 const customCodeMessage = {
   10004: 'Token认证失败',
+  10003: 'Token失效',
   10002: '账号或密码错误',
   800  : '数据不存在',
 };
@@ -54,14 +56,19 @@ function httpErrorHandler(response) {
 function apiErrorHandler(data) {
   if (!data.success) {
     const errortext = customCodeMessage[data.code] || data.message;
+    // 登录密码错误
+    if (data.code === 10002) {
+      message.error(errortext);
+    // Token失效，跳转到登录界面
+    } else if (data.code === 10003) {
+      message.error('认证失效,请重新登录!');
+      const { dispatch } = store;
+      dispatch(routerRedux.push('/user/login'));
     // Token认证失败, 跳转到登录界面
-    if (data.code === 10004) {
-      message.error('登录失效,请重新登录!');
+    } else if (data.code === 10004) {
+      message.error('认证失败,请重新登录!');
       const { dispatch } = store;
       dispatch(routerRedux.push('/user/login'));
-    // 登录密码错误
-    } else if (data.code === 10002) {
-      message.error(errortext);
     // 其它错误打出错误代码
     } else {
       message.error(`请求错误 错误代码:${data.code} 错误信息:${errortext}`);
@@ -95,12 +102,14 @@ 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,
     }
   }