增加几个字段

src/common/router.js

@@ -172,12 +172,12 @@ export const getRouterData = (app) => {
     //   component: dynamicWrapper(app, ['order/detail'], () => import('../routes/Order/detail')),
     //   name: '修改订单',
     // },
-    // '/order/profile/:id': {
-    //   component: dynamicWrapper(app, ['order/detail'], () => import('../routes/Order/detail/orderProfile')),
-    //   name: '订单详情',
-    // },
+    '/order/profile/:id': {
+      component: dynamicWrapper(app, ['order/detail'], () => import('../routes/Order/Edit')),
+      name: '订单详情',
+    },
     '/sold': {
-      component: dynamicWrapper(app, [], () => import('../routes/SoldProduct')),
+      component: dynamicWrapper(app, ['soldProduct'], () => import('../routes/SoldProduct')),
     },
     '/user': {
       component: dynamicWrapper(app, [], () => import('../layouts/UserLayout')),

src/components/SelectModal/ForSelTable.js

@@ -36,7 +36,7 @@ export default class ForSelTable extends PureComponent {
       render: (text, record) => (
         <Button
           onClick={() => onAdd(record)}
-          disabled={selected.filter(item => item.id === record.id).length}
+          disabled={selected.filter(item => item.id === record.id).length || record.selectable}
           size="small"
           type="primary"
         >

src/models/order/detail.js

@@ -1,5 +1,5 @@
 import { message } from 'antd';
-import { queryOne, create, update } from '../../services/order';
+import { queryOne, create, update, confirmPay, confirmSend, confirmReceive } from '../../services/order';
 import pathToRegexp from 'path-to-regexp';
 import { Codes } from '../../utils/config';
 
@@ -45,10 +45,32 @@ export default {
         if (callback) callback();
       }
     },
-    * update ({ payload, callback }, { call, put }) {
-      const { data, success } = yield call(update, payload);
+    // * update ({ payload, callback }, { call, put }) {
+    //   const { data, success } = yield call(update, payload);
+    //   if (success) {
+    //     message.success('')
+    //     yield put({ type: 'initState' });
+    //     if (callback) callback();
+    //   }
+    // },
+    * orderPay ({ payload, callback }, { call, put }) {
+      const { data, success } = yield call(confirmPay, payload);
       if (success) {
-        yield put({ type: 'initState' });
+        message.success('支付成功!');
+        if (callback) callback();
+      }
+    },
+    * orderSend ({ payload, callback }, { call, put }) {
+      const { data, success } = yield call(confirmSend, payload);
+      if (success) {
+        message.success('发货成功!');
+        if (callback) callback();
+      }
+    },
+    * orderReceive ({ payload, callback }, { call, put }) {
+      const { data, success } = yield call(confirmReceive, payload);
+      if (success) {
+        message.success('确认收货成功!');
         if (callback) callback();
       }
     }

src/models/soldProduct.js

@@ -0,0 +1,55 @@
+import { query } from '../services/soldProduct';
+import { message } from 'antd';
+import modelExtend from 'dva-model-extend';
+import queryString from 'query-string';
+import { pageModel } from './common';
+import { checkSearchParams } from '../utils/utils';
+import { Codes, pageSize } from '../utils/config';
+
+export default modelExtend(pageModel, {
+  namespace: 'snapshot',
+
+  state: {
+    listLoading: false,
+  },
+
+  subscriptions: {
+    setup({ dispatch, history }) {
+      history.listen((location) => {
+        if (location.pathname === '/sold') {
+          const payload = checkSearchParams(queryString.parse(location.search));
+          dispatch({
+            type: 'query',
+            payload,
+          });
+        }
+      });
+    }
+  },
+
+  effects: {
+    * query ({ payload, callback }, { call, put }) {
+      yield put({ type: 'changeLoading', payload: { listLoading: true }});
+      const { data, success } = yield call(query, payload);
+      if (success) {
+        yield put({
+          type: 'querySuccess',
+          payload: {
+            list: data.list,
+            pagination: {
+              current: Number(payload.pageNo) || 1,
+              pageSize: Number(payload.pageSize) || pageSize,
+              total: data.totalSize,
+            }
+          }
+        });
+      }
+    }
+  },
+
+  reducers: {
+    changeLoading(state, action) {
+      return { ...state, ...action.payload };
+    },
+  },
+})

src/routes/Campus/table.less

@@ -2,40 +2,44 @@
 @import "../../utils/utils.less";
 
 .table {
-  .ant-table-tbody > tr > td,
-  .ant-table-thead > tr > th {
-    height: 62px;
+  :global {
+    .ant-table-tbody > tr > td,
+    .ant-table-thead > tr > th {
+      height: 62px;
+    }
   }
 
   &.motion {
-    .ant-table-tbody > tr > td,
-    .ant-table-thead > tr > th {
-      &:nth-child(1) {
-        width: 16%;
-      }
+    :global {
+      .ant-table-tbody > tr > td,
+      .ant-table-thead > tr > th {
+        &:nth-child(1) {
+          width: 16%;
+        }
 
-      &:nth-child(2) {
-        width: 20%;
-      }
+        &:nth-child(2) {
+          width: 20%;
+        }
 
-      &:nth-child(3) {
-        width: 10%;
-      }
+        &:nth-child(3) {
+          width: 12%;
+        }
 
-      &:nth-child(4) {
-        width: 10%;
-      }
+        &:nth-child(4) {
+          width: 10%;
+        }
 
-      &:nth-child(5) {
-        width: 16%;
-      }
+        &:nth-child(5) {
+          width: 14%;
+        }
 
-      &:nth-child(6) {
-        width: 14%;
-      }
+        &:nth-child(6) {
+          width: 18%;
+        }
 
-      &:nth-child(7) {
-        width: 14%;
+        &:nth-child(7) {
+          width: 10%;
+        }
       }
     }
 

src/routes/Combo/Edit/index.js

@@ -28,11 +28,15 @@ export default class PackageProfile extends PureComponent {
     });
   }
 
-  handleInputNumberChange = (value, record) => {
+  handleInputNumberChange = (value, record, field) => {
     const { currentItem } = this.props.comboDetail;
     const { products } = currentItem;
     const boundPriceProducts = [...products];
-    boundPriceProducts.map(item => item.pid === record.pid ? item.cpPrice = value : null);
+    if (field == 'cp') {
+      boundPriceProducts.map(item => item.pid === record.pid ? item.cpPrice = value : null);
+    } else if (field == 'pj') {
+      boundPriceProducts.map(item => item.pid === record.pid ? item.merchantPrice = value : null);
+    }
     this.props.dispatch({
       type: 'comboDetail/savePrice',
       payload: boundPriceProducts,
@@ -121,6 +125,10 @@ export default class PackageProfile extends PureComponent {
         message.error('还有供应商价格未填写!');
         return;
       }
+      if (products && products.filter(item => !item.merchantPrice).length > 0 ) {
+        message.error('还有渠道方售价未填写!');
+        return;
+      }
       // add params `code` and `name`
       const data = { ...getFieldsValue() };
       // add params `products`
@@ -129,6 +137,7 @@ export default class PackageProfile extends PureComponent {
           pid: item.pid,
           type: item.type,
           cpPrice: item.cpPrice,
+          merchantPrice: item.merchantPrice,
         }));
       }
       // add params `status`
@@ -163,19 +172,19 @@ export default class PackageProfile extends PureComponent {
     const { getFieldDecorator } = form;
 
     const formItemLayout = {
-      labelCol: { span: 7 },
-      wrapperCol: { span: 12 },
+      labelCol: { span: 4 },
+      wrapperCol: { span: 15 },
     };
 
     const submitFormLayout = {
       wrapperCol: {
         xs: { span: 24, offset: 0 },
-        sm: { span: 10, offset: 7 },
+        sm: { span: 15, offset: 4 },
       },
     };
 
     const tableFormLayout = {
-      wrapperCol: { offset: 7, span: 12 },
+      wrapperCol: { offset: 4, span: 15 },
     };
 
     const columns = [{
@@ -192,7 +201,7 @@ export default class PackageProfile extends PureComponent {
       title: '名称',
       dataIndex: 'name',
       key: 'name',
-      width: '20%',
+      width: '21%',
     },{
       title: '类型',
       dataIndex: 'type',
@@ -200,22 +209,36 @@ export default class PackageProfile extends PureComponent {
       render: (text, record) => productType[text],
       width: '15%',
     },{
-      title: '供应商',
-      dataIndex: 'cpName',
-      key: 'cpName',
-      width: '17%',
-    },{
-      title: '供应商价格',
+    //   title: '供应商',
+    //   dataIndex: 'cpName',
+    //   key: 'cpName',
+    //   width: '17%',
+    // },{
+      title: '供应商售价',
       dataIndex: 'cpPrice',
       key: 'cpPrice',
       render: (text, record) => (
         <InputNumber
           min={0}
+          style={{ width: '100%' }}
           value={record.cpPrice}
-          onChange={(value) => this.handleInputNumberChange(value, record)}
+          onChange={(value) => this.handleInputNumberChange(value, record, 'cp')}
+        />
+      ),
+      width: '22%',
+    },{
+      title: '渠道售价',
+      dataIndex: 'merchantPrice',
+      key: 'merchantPrice',
+      render: (text, record) => (
+        <InputNumber
+          min={0}
+          style={{ width: '100%' }}
+          value={record.merchantPrice}
+          onChange={(value) => this.handleInputNumberChange(value, record, 'pj')}
         />
       ),
-      width: '28%',
+      width: '22%',
     }];
 
     return (

src/routes/Course/Edit/index.js

@@ -277,6 +277,8 @@ export default class CourseDetail extends PureComponent {
     } = courseDetail;
     const {
       name,
+      subTitle,
+      breadCrumbs,
       code,
       digest,
       detail,
@@ -345,6 +347,16 @@ export default class CourseDetail extends PureComponent {
                   initialValue: name,
                 })(<Input />)}
               </FormItem>
+              <FormItem label="课程副标题：" hasFeedback {...formItemLayout}>
+                {getFieldDecorator('subTitle', {
+                  initialValue: subTitle,
+                })(<Input />)}
+              </FormItem>
+              <FormItem label="面包屑导航：" hasFeedback {...formItemLayout}>
+                {getFieldDecorator('breadCrumbs', {
+                  initialValue: breadCrumbs,
+                })(<Input />)}
+              </FormItem>
               <FormItem label="课程概要：" hasFeedback {...formItemLayout}>
                 {getFieldDecorator('digest', {
                   initialValue: digest,

src/routes/MProduct/Edit/index.js

@@ -275,7 +275,7 @@ export default class MerchantProductEdit extends PureComponent {
         </Card>
         <FooterToolbar>
           <Button onClick={this.handlePageExit} type="primary">
-            完成
+            返回产品列表
           </Button>
         </FooterToolbar>
       </PageHeaderLayout>

src/routes/Merchant/Edit/baseInfo.js

@@ -73,15 +73,25 @@ export default class BaseInfoCard extends PureComponent {
                 </Radio.Group>
               )}
             </Form.Item>
+            <Form.Item label="联系人" hasFeedback {...formItemLayout}>
+              {getFieldDecorator('contactName',{
+                initialValue: item.contactName,
+              })(<Input />)}
+            </Form.Item>
+            <Form.Item label="联系电话" hasFeedback {...formItemLayout}>
+              {getFieldDecorator('mobile',{
+                initialValue: item.mobile,
+              })(<Input />)}
+            </Form.Item>
             <Form.Item label="开户银行" hasFeedback {...formItemLayout}>
               {getFieldDecorator('depositBank',{
-                rules: [{ required: true, type: 'string', message: '开户银行为必填项!' }],
+                rules: [{ required: true, type: 'string', message: '开户行为必填项!' }],
                 initialValue: item.depositBank,
               })(<Input />)}
             </Form.Item>
             <Form.Item label="银行账户" hasFeedback {...formItemLayout}>
               {getFieldDecorator('bankAccount',{
-                rules: [{ required: true, type: 'string', message: '银行账户为必填项!' }],
+                rules: [{ required: true, type: 'string', message: '账户为必填项!' }],
                 initialValue: item.bankAccount,
               })(<Input />)}
             </Form.Item>

src/routes/Merchant/Edit/index.js

@@ -176,15 +176,11 @@ export default class MerchantDetail extends PureComponent {
         });
       },
       onSubmit: (data) => {
-        const newData = { ...data };
-        if (operType === 'create') {
+        const { gmtCreated, gmtModified, ...rest } = currentItem;
+        const newData = {...rest, ...data};
+        if (operType == 'create') {
           newData.status = Codes.CODE_NORMAL;
         }
-        if (operType === 'update') {
-          const { id, status } = currentItem;
-          newData.status = status;
-          newData.id = id;
-        }
         dispatch({
           type: `merchantDetail/${operType}`,
           payload: newData,

src/routes/Order/Add/index.js

@@ -3,6 +3,7 @@ import { connect } from 'dva';
 import { routerRedux } from 'dva/router';
 import queryString from 'query-string';
 import {
+  Tooltip,
   Popover,
   Modal,
   Card,
@@ -70,19 +71,42 @@ export default class CreateOrder extends Component {
     this.props.dispatch({ type: 'orderDetail/hideTerminalModal' });
   }
 
-  handleTerminalModalSearch = () => {
-
+  handleTerminalModalSearch = (data) => {
+    const newData = { ...data };
+    if (newData.keyword) {
+      newData[newData.field] = newData.keyword;
+    }
+    delete newData.field;
+    delete newData.keyword;
+    this.props.dispatch({
+      type: `terminal/query`,
+      payload: { ...newData, pageNo: 1, pageSize },
+    });
   }
 
-  handleTerminalModalTableChange = () => {
+  handleTerminalModalTableChange = (pagination, filterArgs, filters) => {
+    const newFilters = { ...filters };
+    if (newFilters.keyword) {
+      newFilters[newFilters.field] = 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 };
+      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]);
+    this.props.dispatch({ type: `terminal/query`, payload: data });
   }
 
   // 产品选择弹框
   handleProductSelectBtnClick = () => {
-    const { orderDetail } = this.props;
-    const { currentItem } = orderDetail;
-    const { merchantId } = currentItem;
+    const { userInfo } = this.state;
+    const { merchantId } = userInfo;
     this.props.dispatch({ type: 'orderDetail/showProductModal' });
     this.props.dispatch({
       type: 'mproduct/query',
@@ -94,12 +118,40 @@ export default class CreateOrder extends Component {
     });
   }
 
-  handleProductModalSearch = () => {
-
+  handleProductModalSearch = (data) => {
+    const { userInfo } = this.state;
+    const { merchantId } = userInfo;
+    const newData = { ...data };
+    if (newData.keyword) {
+      newData[newData.field] = newData.keyword;
+    }
+    delete newData.field;
+    delete newData.keyword;
+    this.props.dispatch({
+      type: 'mproduct/query',
+      payload: { ...newData, merchantId, pageNo: 1, pageSize },
+    });
   }
 
-  handleProductModalTableChange = () => {
+  handleProductModalTableChange = (pagination, filterArgs, filters) => {
+    const { userInfo } = this.state;
+    const { merchantId } = userInfo;
+    const newFilters = { ...filters };
+    if (newFilters.keyword) {
+      newFilters[newFilters.field] = 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 };
+      newObj[key] = getValue(filterArgs[key]);
+      return newObj;
+    }, {});
 
+    const data = { ...newFilters, ...tableFilters, pageNo: pagination.current, pageSize: pagination.pageSize, merchantId };
+    Object.keys(data).map(key => data[key] ? null : delete data[key]);
+    this.props.dispatch({ type: 'mporduct/query', payload: data });
   }
 
   // 选择产品
@@ -116,9 +168,28 @@ export default class CreateOrder extends Component {
     this.props.dispatch({ type: 'orderDetail/hideProductModal' });
   }
 
+  // 对待选的产品进行过滤，如果没有goods则不可选
+  productListFilter = (list) => {
+    const newList = [...list];
+    newList.map(item =>
+      (!item.goods || item.goods.length == 0) ? item.selectable = true : item.selectable = false);
+    return newList;
+  }
+
   handleListItemDel = (record) => {
+    const { products, tableDatas } = this.state;
     Modal.confirm({
       title: '确定从清单中删除此商品?',
+      cancelText: '取消',
+      okText: '确认',
+      onOk: () => {
+        const newProducts = products.filter(item => item.id !== record.key);
+        const newTableDatas = tableDatas.filter(item => item.key.indexOf(record.key) == -1);
+        this.setState({
+          products: newProducts,
+          tableDatas: newTableDatas,
+        });
+      },
     });
   }
 
@@ -244,6 +315,7 @@ export default class CreateOrder extends Component {
       };
     };
     data.map(item => {
+      if (!item.goods || item.goods.length == 0) return;
       if (item.type == Codes.CODE_COURSE) {
         const newObj = rowDataMaker(item);
         newObj.sumRows = 1;
@@ -329,6 +401,7 @@ export default class CreateOrder extends Component {
     const { getFieldDecorator } = form;
     const { terminalModalShow, productModalShow } = orderDetail;
     const listData = tableDatas;
+    const productList = this.productListFilter(mproduct.list);
 
     const formItemLayout = {
       labelCol: {
@@ -416,7 +489,7 @@ export default class CreateOrder extends Component {
             />
           );
         // 配套
-        } else if (row.type == Codes.CODE_COURSE && !row.parent) {
+        } else if (row.type == Codes.CODE_SUPPORT && !row.parent) {
           return (
             <InputNumber
               value={text}
@@ -460,7 +533,7 @@ export default class CreateOrder extends Component {
       title: '操作',
       dataIndex: 'operation',
       key: 10,
-      render: (text, row) => ({ children: <a>删除</a>, props: { rowSpan: row.sumRows } }),
+      render: (text, row) => ({ children: <a onClick={() => this.handleListItemDel(row)}>删除</a>, props: { rowSpan: row.sumRows } }),
       width: '7%',
     }];
 
@@ -520,7 +593,13 @@ export default class CreateOrder extends Component {
               )}
             </Form.Item>
             <Form.Item label="添加商品" {...formItemLayout}>
-              <Button onClick={this.handleProductSelectBtnClick} disabled={userInfo.merchantId ? false : true} type="primary" size="small" icon="plus-circle-o">添加</Button>
+              {userInfo.merchantId ?
+                <Button onClick={this.handleProductSelectBtnClick} type="primary" size="small" icon="plus-circle-o">添加</Button>
+              :
+                <Tooltip title="先选择终端">
+                  <Button onClick={this.handleProductSelectBtnClick} disabled={true} type="primary" size="small" icon="plus-circle-o">添加</Button>
+                </Tooltip>
+              }
               <Table
                 bordered
                 scroll={{ x: 1250 }}
@@ -552,7 +631,7 @@ export default class CreateOrder extends Component {
             selTableData={products}
             style={{ top: 20 }}
             width={660}
-            fsTableDataSource={mproduct.list}
+            fsTableDataSource={productList}
             fsTableLoading={mproduct.listLoading}
             fsTablePagination={mproduct.pagination}
             onOk={this.handleProductModalOk}

src/routes/Order/Add/terminal.js

@@ -22,17 +22,15 @@ export default class TerminalSelectModal extends PureComponent {
     };
 
     const searchProps = {
-      searchField: 'name',
+      searchField: 'code',
       searchKeyWord: '',
       searchSize: 'default',
       searchSelect: true,
       searchSelectOptions: [{
-        value: 'name', name: '终端名称', mode: 'input',
-      },{
         value: 'code', name: '终端编号', mode: 'input',
       }],
       searchSelectProps: {
-        defaultValue: 'name',
+        defaultValue: 'code',
       },
       onSearch: (value) => {
         onSearch(value);

src/routes/Order/Edit/index.js

@@ -0,0 +1,207 @@
+import React, { Component } from 'react';
+import { connect } from 'dva';
+import { routerRedux } from 'dva/router';
+import queryString from 'query-string';
+import { Card, Modal, Steps, Badge, Button, Table, Divider } from 'antd';
+import Debounce from 'lodash-decorators/debounce';
+import Bind from 'lodash-decorators/bind';
+import moment from 'moment';
+import PageHeaderLayout from '../../../layouts/PageHeaderLayout';
+import FooterToolbar from '../../../components/FooterToolbar';
+import DescriptionList from '../../../components/DescriptionList';
+import { Codes, orderStatuses } from '../../../utils/config';
+import styles from './index.less';
+
+const { Description } = DescriptionList;
+const getWindowWidth = () => (window.innerWidth || document.documentElement.clientWidth);
+
+@connect(state => ({ orderDetail: state.orderDetail }))
+export default class OrderProfile extends Component {
+  state = {
+    stepDirection: 'horizontal',
+  };
+
+  componentDidMount() {
+    this.setStepDirection();
+    window.addEventListener('resize', this.setStepDirection);
+  }
+
+  componentWillUnmount() {
+    window.removeEventListener('resize', this.setStepDirection);
+    this.setStepDirection.cancel();
+  }
+
+  @Bind()
+  @Debounce(200)
+  setStepDirection() {
+    const { stepDirection } = this.state;
+    const w = getWindowWidth();
+    if (stepDirection !== 'vertical' && w <= 576) {
+      this.setState({
+        stepDirection: 'vertical',
+      });
+    } else if (stepDirection !== 'horizontal' && w > 576) {
+      this.setState({
+        stepDirection: 'horizontal',
+      });
+    }
+  }
+
+  handlePageCancel = () => {
+    const { filters, dispatch } = this.props;
+    dispatch(routerRedux.push({
+      pathname: '/order',
+      search: queryString.stringify(filters),
+    }));
+  }
+
+  handleOrderStatus = ({ id, type, name }) => {
+    const { dispatch, orderDetail } = this.props;
+    const { filters } = orderDetail;
+    Modal.confirm({
+      title: name,
+      cancelText: '取消',
+      okText: '确认',
+      onOk: () =>
+        dispatch({
+          type: `orderDetail/${type}`,
+          payload: { id },
+          callback: () => {
+            dispatch(routerRedux.push({
+              pathname: `/order/profile/${id}`,
+              search: queryString.stringify(filters),
+            }));
+          },
+        }),
+    });
+  }
+
+  render() {
+    const { orderDetail } = this.props;
+    const { stepDirection } = this.state;
+    const { currentItem } = orderDetail;
+    const {
+      id,
+      code,
+      gmtCreated,
+      userCode,
+      status,
+      provinceCode,
+      cityName,
+      zoneName,
+      classroomName,
+      orderStatus,
+      merchantName,
+      finalPrice,
+      adjustPrice,
+      name,
+      mobile,
+      address,
+      note,
+    } = currentItem;
+
+    const goodsTableColumns = [{
+      title: '商品编号',
+      dataIndex: 'code',
+      key: 'code',
+    },{
+      title: '商品类型',
+      dataIndex: 'type',
+      key: 'type',
+    },{
+      title: '商品名称',
+      dataIndex: 'name',
+      key: 'name',
+    },{
+      title: '领教定价',
+      dataIndex: 'lingjiaoPrice',
+      key: 'lingjiaoPrice',
+    },{
+      title: '渠道定价',
+      dataIndex: 'merchantPrice',
+      key: 'merchantPrice',
+    },{
+      title: '实际售价',
+      dataIndex: 'finalPrice',
+      key: 'finalPrice',
+    },{
+      title: '数量',
+      dataIndex: 'quality',
+      key: 'quality',
+    },{
+      title: '单位',
+      dataIndex: 'chargeUnit',
+      key: 'chargeUnit',
+    },{
+      title: '起始时间',
+      dataIndex: 'timeBegin',
+      key: 'timeBegin',
+    },{
+      title: '结束时间',
+      dataIndex: 'timeEnd',
+      key: 'timeEnd',
+    }];
+
+    const stepMap = {
+      [Codes.CODE_UNPAID]: 0,
+      [Codes.CODE_PAID]: 1,
+      [Codes.CODE_FORSEND]: 1,
+      [Codes.CODE_SENT]: 2,
+      [Codes.CODE_RECEIVED]: 3,
+      [Codes.CODE_CANCEL]: 4,
+      [Codes.CODE_COMPLETE]: 4,
+    }
+
+    return (
+      <PageHeaderLayout title="订单详情">
+        <Card title="处理进度" style={{ marginBottom: 20 }} bordered={false}>
+          <Steps direction={stepDirection} current={stepMap[orderStatus]}>
+            <Steps.Step
+              title="待支付"
+              description={orderStatus == Codes.CODE_UNPAID ? <a onClick={() => this.handleOrderStatus({id, type: 'orderPay', name: '确定支付?'})}>立即支付</a> : null}
+            />
+            <Steps.Step title="已支付" />
+            <Steps.Step
+              title="已发货"
+              description={orderStatus == Codes.CODE_SENT ? <a  onClick={() => this.handleOrderStatus({id, type: 'orderReceive', name: '确认收货?'})}>确认收货</a> : null}
+            />
+            <Steps.Step
+              title="已收货"
+            />
+            <Steps.Step title="已完成" />
+          </Steps>
+        </Card>
+        <Card bordered={false}>
+          <DescriptionList size="large" title="订单信息" col={2} style={{ marginBottom: 32 }}>
+            <Description term="订单编号">{code}</Description>
+            <Description term="创建时间">{moment(gmtCreated).format('YYYY-MM-DD HH:mm:ss')}</Description>
+            <Description term="终端编号">{userCode}</Description>
+            <Description term="终端名称">{`${provinceCode}-${cityName}-${zoneName}-${classroomName}`}</Description>
+            <Description term="渠道名称">{merchantName}</Description>
+            <Description term="最终售价">{`${finalPrice} 元`}</Description>
+            <Description term="优惠价格">{`${adjustPrice || 0} 元`}</Description>
+            <Description term="支付状态">{orderStatuses[orderStatus]}</Description>
+          </DescriptionList>
+          <Divider style={{ marginBottom: 32 }} />
+          <DescriptionList size="large" title="收货信息" col={2} style={{ marginBottom: 32 }}>
+            <Description term="收货人">{name}</Description>
+            <Description term="联系电话">{mobile}</Description>
+            <Description term="收货地址">{address}</Description>
+            <Description term="备注">{note}</Description>
+          </DescriptionList>
+          {/*
+          <Divider style={{ marginBottom: 32 }} />
+          <div className={styles.title}>商品清单</div>
+          <Table
+            dataSource={[]}
+            columns={goodsTableColumns}
+          />
+          */}
+        </Card>
+        <FooterToolbar>
+          <Button onClick={this.handlePageCancel} type="primary">返回订单列表</Button>
+        </FooterToolbar>
+      </PageHeaderLayout>
+    );
+  }
+}

src/routes/Order/Edit/orderProfile.js

@@ -1,88 +0,0 @@
-import React, { Component } from 'react';
-import { connect } from 'dva';
-import { Card, Badge, Table, Divider } from 'antd';
-import moment from 'moment';
-import PageHeaderLayout from '../../../layouts/PageHeaderLayout';
-import DescriptionList from '../../../components/DescriptionList';
-import { Codes, orderStatuses } from '../../../utils/config';
-import styles from './orderProfile.less';
-
-const { Description } = DescriptionList;
-
-@connect(state => ({ orderDetail: state.orderDetail }))
-export default class OrderProfile extends Component {
-  render() {
-    const { orderDetail } = this.props;
-    const { currentItem } = orderDetail;
-    const { code, gmtCreated, userCode, status, provinceCode, cityName, zoneName, classroomName } = currentItem;
-
-    const goodsTableColumns = [{
-      title: '商品编号',
-      dataIndex: 'code',
-      key: 'code',
-    },{
-      title: '商品类型',
-      dataIndex: 'type',
-      key: 'type',
-    },{
-      title: '商品名称',
-      dataIndex: 'name',
-      key: 'name',
-    },{
-      title: '领教定价',
-      dataIndex: 'lingjiaoPrice',
-      key: 'lingjiaoPrice',
-    },{
-      title: '渠道定价',
-      dataIndex: 'merchantPrice',
-      key: 'merchantPrice',
-    },{
-      title: '实际售价',
-      dataIndex: 'finalPrice',
-      key: 'finalPrice',
-    },{
-      title: '数量',
-      dataIndex: 'quality',
-      key: 'quality',
-    },{
-      title: '单位',
-      dataIndex: 'chargeUnit',
-      key: 'chargeUnit',
-    },{
-      title: '起始时间',
-      dataIndex: 'timeBegin',
-      key: 'timeBegin',
-    },{
-      title: '结束时间',
-      dataIndex: 'timeEnd',
-      key: 'timeEnd',
-    }];
-
-    return (
-      <PageHeaderLayout title="订单详情">
-        <Card bordered={false}>
-          <DescriptionList size="large" title="订单信息" col={2} style={{ marginBottom: 32 }}>
-            <Description term="订单编号">{code}</Description>
-            <Description term="创建时间">{moment(gmtCreated).format('YYYY-MM-DD HH:mm:ss')}</Description>
-            <Description term="终端编号">{userCode}</Description>
-            <Description term="终端名称">{`${provinceCode}-${cityName}-${zoneName}-${classroomName}`}</Description>
-            <Description term="支付状态">{orderStatuses[status]}</Description>
-          </DescriptionList>
-          <Divider style={{ marginBottom: 32 }} />
-          <DescriptionList size="large" title="收货信息" col={2} style={{ marginBottom: 32 }}>
-            <Description term="收货人">付小小</Description>
-            <Description term="联系电话">18100000000</Description>
-            <Description term="收货地址">浙江省杭州市西湖区万塘路18号</Description>
-            <Description term="备注">无</Description>
-          </DescriptionList>
-          <Divider style={{ marginBottom: 32 }} />
-          <div className={styles.title}>商品清单</div>
-          <Table
-            dataSource={[]}
-            columns={goodsTableColumns}
-          />
-        </Card>
-      </PageHeaderLayout>
-    );
-  }
-}

src/routes/Order/List/index.js

@@ -67,7 +67,7 @@ export default class Order extends PureComponent {
       loading: listLoading,
       timeBegin: filters.timeBegin,
       timeEnd: filters.timeEnd,
-      curStatus: filters.status,
+      curStatus: filters.orderStatus,
       onChange: (pagination, filterArgs) => {
         const getValue = obj => Object.keys(obj).map(key => obj[key]).join(',');
         const tableFilters = Object.keys(filterArgs).reduce((obj, key) => {

src/routes/Order/List/table.js

@@ -70,51 +70,56 @@ export default class TableList extends PureComponent {
     }
   }
 
-  handleMenuClick = (record, e) => {
-    const { onDeleteItem, onViewItem, onEditItem, onRecoverItem } = this.props;
-    if (e.key === '1') {
-      onViewItem(record);
-    } else if (e.key === '2') {
-      console.log('enter into edit page...');
-    }else if (e.key === '3') {
-      Modal.confirm({
-        title: '你确定要作废该订单?',
-        onOk () {
-          console.log('deleting...');
-          // onDeleteItem(record.id)
-        },
-      });
-    }
+  handleItemView = (record) => {
+    const { onViewItem } = this.props;
+    onViewItem({ id: record.id });
   }
 
+  // handleMenuClick = (record, e) => {
+  //   const { onDeleteItem, onViewItem, onEditItem, onRecoverItem } = this.props;
+  //   if (e.key === '1') {
+  //     onViewItem(record);
+  //   } else if (e.key === '2') {
+  //     console.log('enter into edit page...');
+  //   }else if (e.key === '3') {
+  //     Modal.confirm({
+  //       title: '你确定要作废该订单?',
+  //       onOk () {
+  //         console.log('deleting...');
+  //         // onDeleteItem(record.id)
+  //       },
+  //     });
+  //   }
+  // }
+
   // 根据订单状态确定下拉菜单的选项
-  renderOperationButton = (record) => {
-    switch (record.orderStatus) {
-      case Codes.CODE_PAID:
-        return (
-          <div>
-            <Button type="primary" size="small">查看</Button>
-          </div>
-        );
-        break;
-      case Codes.CODE_UNPAID:
-        return (
-          <div>
-            <a>支付</a>
-          </div>
-        );
-        break;
-      case Codes.CODE_CANCEL:
-        return (
-          <div>
-            <a>查看</a>
-          </div>
-        );
-        break;
-      default:
-        break;
-    }
-  }
+  // renderOperationButton = (record) => {
+  //   switch (record.orderStatus) {
+  //     case Codes.CODE_PAID:
+  //       return (
+  //         <div>
+  //           <Button type="primary" size="small">查看</Button>
+  //         </div>
+  //       );
+  //       break;
+  //     case Codes.CODE_UNPAID:
+  //       return (
+  //         <div>
+  //           <a>支付</a>
+  //         </div>
+  //       );
+  //       break;
+  //     case Codes.CODE_CANCEL:
+  //       return (
+  //         <div>
+  //           <a>查看</a>
+  //         </div>
+  //       );
+  //       break;
+  //     default:
+  //       break;
+  //   }
+  // }
 
   render() {
     const { curStatus, onDeleteItem, onRecoverItem, onEditItem, location, pagination, ...tableProps } = this.props;
@@ -151,7 +156,7 @@ export default class TableList extends PureComponent {
         const statusMap = {
           [Codes.CODE_UNPAID]: 'default',
           [Codes.CODE_COMPLETE]: 'success',
-          [Codes.CODE_CANCEL]: 'error'
+          [Codes.CODE_CANCEL]: 'error',
         };
         return (<Badge status={statusMap[record.orderStatus] || 'processing'} text={orderStatuses[record.orderStatus]} />);
       },
@@ -184,7 +189,8 @@ export default class TableList extends PureComponent {
       title: '操作',
       dataIndex: 'operation',
       key: 'operation',
-      render: (text, record) => this.renderOperationButton(record),
+      // render: (text, record) => this.renderOperationButton(record),
+      render: (text, record) => <a onClick={() => this.handleItemView(record)}>查看</a>
     }];
 
     // 数据table列表表头的筛选按钮点击重置后status值为空，此时删除该参数

src/routes/SoldProduct/index.js

@@ -1,33 +1,37 @@
 import React, { Component } from 'react';
-import { Table, Card, Form, Row, Col, Input, Select, DatePicker } from 'antd';
+import { connect } from 'dva';
+import { Divider, Table, Card, Form, Row, Col, Input, Select, DatePicker, Icon } from 'antd';
 import moment from 'moment';
 import { productType } from '../../utils/config';
 import styles from './index.less';
 
 @Form.create()
+@connect(state => ({ snapshot: state.snapshot }))
 export default class SoldProductList extends Component {
   render() {
     // 模拟数据
-    const mockData = [];
-    for (let i = 1; i < 2000; i++) {
-      mockData.push({
-        id: i,
-        productCode: 'C-001',
-        productName: '小学语文二年级上册',
-        productType: 'COURSE',
-        userCode: '1500024398001',
-        userName: '教室六',
-        campusCode: '1500024398',
-        campusName: '湖南省-长沙市天水区-育新小学',
-        merchantName: '贝尔安亲',
-        cpPrice: 1000.85,
-        merchantPrice: 20000.890,
-        terminalPrice: 21000,
-        chargeUnit: '年',
-        quantity: 1,
-        gmtCreated: 1590000134,
-      });
-    }
+    // const mockData = [];
+    // for (let i = 1; i < 2000; i++) {
+    //   mockData.push({
+    //     id: i,
+    //     productCode: 'C-001',
+    //     productName: '小学语文二年级上册',
+    //     productType: 'COURSE',
+    //     userCode: '1500024398001',
+    //     userName: '教室六',
+    //     campusCode: '1500024398',
+    //     campusName: '湖南省-长沙市天水区-育新小学',
+    //     merchantName: '贝尔安亲',
+    //     cpPrice: 1000.85,
+    //     merchantPrice: 20000.890,
+    //     terminalPrice: 21000,
+    //     chargeUnit: '年',
+    //     quantity: 1,
+    //     gmtCreated: 1590000134,
+    //   });
+    // }
+    const { snapshot } = this.props;
+    const { list, listLoading } = snapshot;
 
     // 表格-列对象
     const columns = [{
@@ -95,80 +99,14 @@ export default class SoldProductList extends Component {
     return (
       <Card>
         <div className={styles.tableList}>
-          <div className={styles.tableListForm}>
-            <Form layout="inline">
-              <Row gutter={{ md: 8, lg: 24, xl: 48 }}>
-                <Col md={8} sm={24}>
-                  <Form.Item label="渠道">
-                    {getFieldDecorator('merchantId')(
-                      <Input placeholder="请选择" />
-                    )}
-                  </Form.Item>
-                </Col>
-                <Col md={8} sm={24}>
-                  <Form.Item label="校区">
-                    {getFieldDecorator('campusId')(
-                      <Input placeholder="请选择" />
-                    )}
-                  </Form.Item>
-                </Col>
-                <Col md={8} sm={24}>
-                  <Form.Item label="终端">
-                    {getFieldDecorator('uid')(
-                      <Input placeholder="请选择" />
-                    )}
-                  </Form.Item>
-                </Col>
-              </Row>
-              <Row gutter={{ md: 8, lg: 24, xl: 48 }}>
-                <Col md={8} sm={24}>
-                  <Form.Item label="产品类型">
-                    {getFieldDecorator('productType')(
-                      <Input placeholder="请选择" />
-                    )}
-                  </Form.Item>
-                </Col>
-                <Col md={8} sm={24}>
-                  <Form.Item label="产品名称">
-                    {getFieldDecorator('productName')(
-                      <Input placeholder="请输入" />
-                    )}
-                  </Form.Item>
-                </Col>
-                <Col md={8} sm={24}>
-                  <Form.Item label="产品编号">
-                    {getFieldDecorator('productCode')(
-                      <Input placeholder="请输入" />
-                    )}
-                  </Form.Item>
-                </Col>
-              </Row>
-              <Row gutter={{ md: 8, lg: 24, xl: 48 }}>
-                <Col md={8} sm={24}>
-                  <Form.Item label="时间范围">
-                    {getFieldDecorator('time')(
-                      <DatePicker
-                      />
-                    )}
-                  </Form.Item>
-                </Col>
-                <Col md={8} sm={24}>
-                  <Form.Item label="至">
-                    {getFieldDecorator('time')(
-                      <DatePicker
-                      />
-                    )}
-                  </Form.Item>
-                </Col>
-              </Row>
-            </Form>
-          </div>
+          <span>筛选<Icon type="filter" /></span>
           <div>
             <Table
+              loading={listLoading}
               bordered
               rowKey={(record) => record.id}
               columns={columns}
-              dataSource={mockData}
+              dataSource={list}
               scroll={{ x: 1800 }}
             />
           </div>

src/routes/Terminal/Edit/index.js

@@ -120,19 +120,18 @@ export default class TerminalProfile extends Component {
               <Tooltip placement="top" title="点击选择校区">
                 <Button disabled={operType === "update" ? true: false} style={{ marginRight: 20 }} type="primary" size="small" icon="select" onClick={this.handleCampusSelectClick}>选择</Button>
               </Tooltip>
-              {code ?
+              {operType == 'update' ?
                 <List
                   size="small"
                   bordered
                   dataSource={[
-                    `终端编号: ${code}`,
-                    `终端名称: ${name}`,
                     `所属校区: ${campusName}`,
                     `所属渠道: ${merchantName}`,
                   ]}
                   renderItem={item => <List.Item>{item}</List.Item>}
                 />
-              : null}
+              : (campusId ? <List size="small" bordered dataSource={[`${campusName}`]} renderItem={item => <List.Item>{item}</List.Item>}/>
+              : null)}
             </Form.Item>
             <Form.Item label="终端名称：" hasFeedback {...formItemLayout}>
               {getFieldDecorator('name', {

src/routes/Ware/Edit/index.js

@@ -170,7 +170,7 @@ export default class WareDetail extends PureComponent {
     const { resType } = this.state;
     const { getFieldDecorator } = form;
     const { itemLoading, currentItem, filters, modalVisible } = wareDetail;
-    const { resourceList, name, code, digest } = currentItem;
+    const { resourceList, name, code, digest, category } = currentItem;
     const { list, listLoading, pagination } = resource;
 
     // 待选表格去掉分页的跳转及变换页码
@@ -239,6 +239,11 @@ export default class WareDetail extends PureComponent {
                   initialValue: name,
                 })(<Input />)}
               </FormItem>
+              <FormItem label="课件分类：" hasFeedback {...formItemLayout}>
+                {getFieldDecorator('category', {
+                  initialValue: category,
+                })(<Input />)}
+              </FormItem>
               <FormItem label="课件简述：" hasFeedback {...formItemLayout}>
                 {getFieldDecorator('digest', {
                   initialValue: digest,

src/services/campus.js

@@ -11,7 +11,7 @@ export async function create(params) {
     method: 'POST',
     body: JSON.stringify(params),
   };
-  return request(`${campus.replace('/:id', '')}`, options);
+  return request(`${campus}`, options);
 }
 
 export async function update(params) {
@@ -19,5 +19,5 @@ export async function update(params) {
     method: 'PUT',
     body: JSON.stringify(params),
   };
-  return request(`${campus.replace('/:id', '')}`, options);
+  return request(`${campus}`, options);
 }

src/services/order.js

@@ -1,13 +1,13 @@
 import { stringify } from 'qs';
 import request from '../utils/request';
-import { order } from '../utils/api';
+import { order, orderPay, orderSend, orderReceive } from '../utils/api';
 
 export async function query(params) {
   return request(`${order}?${stringify(params)}`);
 }
 
 export async function queryOne({ id }) {
-  return request(`${order}`);
+  return request(`${order}/${id}`);
 }
 
 export async function create(params) {
@@ -27,6 +27,21 @@ export async function update(params) {
 }
 
 export async function remove({ id }) {
-  const options = { method: 'DELETE' }
+  const options = { method: 'DELETE' };
   return request(`${order}`, options);
 }
+
+export async function confirmPay({ id }) {
+  const options = { method: 'POST' };
+  return request(`${orderPay}/${id}`, options);
+}
+
+export async function confirmSend({ id }) {
+  const options = { method: 'POST' };
+  return request(`${orderSend}/${id}`, options);
+}
+
+export async function confirmReceive({ id }) {
+  const options = { method: 'POST' };
+  return request(`${orderReceive}/${id}`, options);
+}

src/services/sales.js

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

src/utils/api.js

@@ -9,7 +9,7 @@ module.exports = {
   userLogin: `${config.apiHost}/login`,
   userLogout: `${config.apiHost}/logout`,
   campuses: `${config.apiHost}/campus/list`,
-  campus: `${config.apiHost}/campus/:id`,
+  campus: `${config.apiHost}/campus`,
   terminals: `${config.apiHost}/user/list`,
   terminal: `${config.apiHost}/user`,
   merchants: `${config.apiHost}/merchant/list`,
@@ -30,5 +30,8 @@ module.exports = {
   bundleTag: `${config.apiHost}/merchant/product/tags`,
   goods: `${config.apiHost}/goods`,
   order: `${config.apiHost}/order`,
-  soldProduct: `${config.apiHost}/soldProduct`,
+  orderPay: `${config.apiHost}/order/pay`,
+  orderSend: `${config.apiHost}/order/send`,
+  orderReceive: `${config.apiHost}/order/receive`,
+  snapShot: `${config.apiHost}/order/snapshot`,
 };