修改面包屑名称;

src/common/router.js

@@ -49,14 +49,14 @@ export const getRouterData = (app) => {
       component: dynamicWrapper(app, ['terminal'], () => import('../routes/Terminal')),
     },
     '/merchant': {
-      component: dynamicWrapper(app, ['merchant/merchant'], () => import('../routes/Merchant')),
+      component: dynamicWrapper(app, ['merchant/merchant'], () => import('../routes/Merchant/List')),
     },
     '/merchant/add': {
-      component: dynamicWrapper(app, ['merchant/detail'], () => import('../routes/Merchant/detail')),
-      name: '添加厂商',
+      component: dynamicWrapper(app, ['merchant/detail'], () => import('../routes/Merchant/Edit')),
+      name: '创建厂商',
     },
     '/merchant/edit/:id': {
-      component: dynamicWrapper(app, ['merchant/detail'], () => import('../routes/Merchant/detail')),
+      component: dynamicWrapper(app, ['merchant/detail'], () => import('../routes/Merchant/Edit')),
       name: '修改厂商',
     },
     '/tag/tagGroup': {
@@ -64,7 +64,7 @@ export const getRouterData = (app) => {
     },
     '/tag/tagGroup/add': {
       component: dynamicWrapper(app, ['group/detail', 'merchant/merchant'], () => import('../routes/TagGroup/Edit')),
-      name: '添加标签组',
+      name: '创建标签组',
     },
     '/tag/tagGroup/edit/:id': {
       component: dynamicWrapper(app, ['group/detail', 'merchant/merchant'], () => import('../routes/TagGroup/Edit')),
@@ -75,32 +75,32 @@ export const getRouterData = (app) => {
     },
     '/tag/tagItem/add': {
       component: dynamicWrapper(app, ['tag/detail', 'group/group'], () => import('../routes/Tag/Edit')),
-      name: '添加标签',
+      name: '创建标签',
     },
     '/tag/tagItem/edit/:id': {
       component: dynamicWrapper(app, ['tag/detail', 'group/group'], () => import('../routes/Tag/Edit')),
       name: '修改标签',
     },
     '/product/ware': {
-      component: dynamicWrapper(app, ['ware/ware'], () => import('../routes/Ware')),
+      component: dynamicWrapper(app, ['ware/ware'], () => import('../routes/Ware/List')),
     },
     '/product/ware/add': {
-      component: dynamicWrapper(app, ['ware/detail', 'resource'], () => import('../routes/Ware/detail')),
-      name: '添加课件',
+      component: dynamicWrapper(app, ['ware/detail', 'resource'], () => import('../routes/Ware/Edit')),
+      name: '创建课件',
     },
     '/product/ware/edit/:id': {
-      component: dynamicWrapper(app, ['ware/detail', 'resource'], () => import('../routes/Ware/detail')),
+      component: dynamicWrapper(app, ['ware/detail', 'resource'], () => import('../routes/Ware/Edit')),
       name: '修改课件',
     },
     '/product/lesson': {
-      component: dynamicWrapper(app, ['lesson/lesson'], () => import('../routes/Lesson')),
+      component: dynamicWrapper(app, ['lesson/lesson'], () => import('../routes/Lesson/List')),
     },
     '/product/lesson/add': {
-      component: dynamicWrapper(app, ['lesson/detail', 'ware/ware'], () => import('../routes/Lesson/detail')),
-      name: '添加课',
+      component: dynamicWrapper(app, ['lesson/detail', 'ware/ware'], () => import('../routes/Lesson/Edit')),
+      name: '创建课',
     },
     '/product/lesson/edit/:id': {
-      component: dynamicWrapper(app, ['lesson/detail', 'ware/ware'], () => import('../routes/Lesson/detail')),
+      component: dynamicWrapper(app, ['lesson/detail', 'ware/ware'], () => import('../routes/Lesson/Edit')),
       name: '修改课',
     },
     '/product/course': {
@@ -108,21 +108,21 @@ export const getRouterData = (app) => {
     },
     '/product/course/add': {
       component: dynamicWrapper(app, ['course/detail', 'resource', 'lesson/lesson', 'support/support', 'merchant/merchant'], () => import('../routes/Course/Edit')),
-      name: '添加课程',
+      name: '创建课程',
     },
     '/product/course/edit/:id': {
       component: dynamicWrapper(app, ['course/detail', 'resource', 'lesson/lesson', 'support/support', 'merchant/merchant'], () => import('../routes/Course/Edit')),
       name: '修改课程',
     },
     '/product/support': {
-      component: dynamicWrapper(app, ['support/support'], () => import('../routes/Support')),
+      component: dynamicWrapper(app, ['support/support'], () => import('../routes/Support/List')),
     },
     '/product/support/add': {
-      component: dynamicWrapper(app, ['support/detail', 'resource', 'support/support', 'merchant/merchant'], () => import('../routes/Support/detail')),
-      name: '添加配套',
+      component: dynamicWrapper(app, ['support/detail', 'resource', 'support/support', 'merchant/merchant'], () => import('../routes/Support/Edit')),
+      name: '创建配套',
     },
     '/product/support/edit/:id': {
-      component: dynamicWrapper(app, ['support/detail', 'resource', 'support/support', 'merchant/merchant'], () => import('../routes/Support/detail')),
+      component: dynamicWrapper(app, ['support/detail', 'resource', 'support/support', 'merchant/merchant'], () => import('../routes/Support/Edit')),
       name: '修改配套',
     },
     '/product/package': {
@@ -132,6 +132,10 @@ export const getRouterData = (app) => {
       component: dynamicWrapper(app, ['combo/detail', 'product'], () => import('../routes/Combo/Edit')),
       name: '创建课程包',
     },
+    '/product/package/edit/:id': {
+      component: dynamicWrapper(app, ['combo/detail', 'product'], () => import('../routes/Combo/Edit')),
+      name: '修改课程包',
+    },
     '/goods': {
       component: dynamicWrapper(app, ['mproduct/mproduct', 'merchant/merchant'], () => import('../routes/MProduct/List')),
     },
@@ -143,20 +147,8 @@ export const getRouterData = (app) => {
       component: dynamicWrapper(app, ['mproduct/detail', 'goods', 'tag/tag'], () => import('../routes/MProduct/Edit')),
       name: '修改商品',
     },
-    // '/goods/add': {
-    //   component: dynamicWrapper(app, [], () => import('../routes/Goods/GoodsProfile')),
-    //   name: '新建商品'
-    // },
-    // '/product/package/add': {
-    //   component: dynamicWrapper(app, ['combo/detail', 'support/support'], () => import('../routes/Combo/detail')),
-    //   name: '添加课程包',
-    // },
-    // '/product/package/edit/:id': {
-    //   component: dynamicWrapper(app, ['combo/detail', 'support/support'], () => import('../routes/Combo/detail')),
-    //   name: '修改课程包',
-    // },
     '/order': {
-      component: dynamicWrapper(app, ['order/order'], () => import('../routes/Order')),
+      component: dynamicWrapper(app, ['order/order'], () => import('../routes/Order/List')),
     },
     // '/order/add': {
     //   component: dynamicWrapper(app, ['order/detail'], () => import('../routes/Order/detail')),
@@ -166,10 +158,10 @@ 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/detail/orderProfile')),
+    //   name: '订单详情',
+    // },
     '/user': {
       component: dynamicWrapper(app, [], () => import('../layouts/UserLayout')),
     },

src/routes/Campus/search.js

@@ -36,7 +36,7 @@ const Search = ({
         <DataSearch { ...searchGroupProps } />
       </Col>
       <Col lg={{ offset: 7, span: 7 }} md={12} sm={8} xs={24} style={{ marginBottom: 16, textAlign: 'right' }}>
-        <Button type="ghost" onClick={onAdd}><Icon type="plus-circle" />添加</Button>
+        <Button type="primary" onClick={onAdd}><Icon type="plus-circle" />创建校区</Button>
       </Col>
     </Row>
   )

src/routes/CmsUser/search.js

@@ -32,7 +32,7 @@ const Search = ({
         <DataSearch { ...searchGroupProps } />
       </Col>
       <Col lg={{ offset: 7, span: 7 }} md={12} sm={8} xs={24} style={{ marginBottom: 16, textAlign: 'right' }}>
-        <Button type="primary" onClick={onAdd}><Icon type="plus-circle" />添加用户</Button>
+        <Button type="primary" onClick={onAdd}><Icon type="plus-circle" />创建用户</Button>
       </Col>
     </Row>
   )

src/routes/Combo/Edit/product.js

@@ -1,6 +1,6 @@
 import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
-import { InputNumber } from 'antd';
+// import { InputNumber } from 'antd';
 import SelectModal from '../../../components/SelectModal';
 import { Codes } from '../../../utils/config';
 
@@ -53,36 +53,36 @@ export default class ProductSelectModal extends PureComponent {
         title: '封面图片',
         dataIndex: 'coverUrl',
         key: 'coverUrl',
-        width: '18%'
+        width: '22%'
       },{
         title: '产品编号',
         dataIndex: 'code',
         key: 'code',
-        width: '18%%',
+        width: '22%',
       },{
         title: '产品名称',
         dataIndex: 'name',
         key: 'name',
-        width: '18%',
+        width: '22%',
       },{
         title: '供应商',
         dataIndex: 'cpName',
         key: 'cpName',
-        width: '18%',
-      },{
-        title: '定价',
-        dataIndex: 'cpPrice',
-        key: 'cpPrice',
-        width: '16%',
-        render: (text, record) => (
-          <InputNumber
-            min={0}
-            value={record.cpPrice}
-            onChange={(value) => {record.cpPrice = value}}
-            formatter={value => `¥ ${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')}
-            parser={value => value.replace(/\¥\s?|(,*)/g, '')}
-          />
-        ),
+        width: '22%',
+      // },{
+      //   title: '定价',
+      //   dataIndex: 'cpPrice',
+      //   key: 'cpPrice',
+      //   width: '16%',
+      //   render: (text, record) => (
+      //     <InputNumber
+      //       min={0}
+      //       value={record.cpPrice}
+      //       onChange={(value) => {record.cpPrice = value}}
+      //       formatter={value => `¥ ${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')}
+      //       parser={value => value.replace(/\¥\s?|(,*)/g, '')}
+      //     />
+      //   ),
       }]
     };
 

src/routes/Course/List/search.js

@@ -40,7 +40,7 @@ export default class Search extends PureComponent {
           <DataSearch { ...searchGroupProps } />
         </Col>
         <Col lg={{ offset: 7, span: 7 }} md={12} sm={8} xs={24} style={{ marginBottom: 16, textAlign: 'right' }}>
-          <Button type="primary" onClick={onAdd}><Icon type="plus-circle" />新建课程</Button>
+          <Button type="primary" onClick={onAdd}><Icon type="plus-circle" />创建课程</Button>
         </Col>
       </Row>
     );

src/routes/Lesson/index.js

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

src/routes/Lesson/search.js

@@ -1,7 +1,7 @@
 import react, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
 import { Button, Form, Row, Col, Icon } from 'antd';
-import DataSearch from '../../components/DataSearch';
+import DataSearch from '../../../components/DataSearch';
 
 @Form.create()
 export default class Search extends PureComponent {
@@ -40,7 +40,7 @@ export default class Search extends PureComponent {
           <DataSearch { ...searchGroupProps } />
         </Col>
         <Col lg={{ offset: 7, span: 7 }} md={12} sm={8} xs={24} style={{ marginBottom: 16, textAlign: 'right' }}>
-          <Button type="primary" onClick={onAdd}><Icon type="plus-circle" />新建课</Button>
+          <Button type="primary" onClick={onAdd}><Icon type="plus-circle" />创建课</Button>
         </Col>
       </Row>
     );

src/routes/Lesson/table.js

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

src/routes/Lesson/table.less

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

src/routes/MProduct/List/search.js

@@ -40,7 +40,7 @@ export default class Search extends PureComponent {
           <DataSearch { ...searchGroupProps } />
         </Col>
         <Col lg={{ offset: 7, span: 7 }} md={12} sm={8} xs={24} style={{ marginBottom: 16, textAlign: 'right' }}>
-          <Button type="primary" onClick={onAdd}><Icon type="plus-circle" />新建商品</Button>
+          <Button type="primary" onClick={onAdd}><Icon type="plus-circle" />创建商品</Button>
         </Col>
       </Row>
     );

src/routes/Merchant/index.js

@@ -6,7 +6,7 @@ import { routerRedux } from 'dva/router';
 import { Card } from 'antd';
 import TableList from './table';
 import Search from './search';
-import PageHeaderLayout from '../../layouts/PageHeaderLayout';
+import PageHeaderLayout from '../../../layouts/PageHeaderLayout';
 
 @connect(state => ({ merchant: state.merchant }))
 export default class Merchant extends PureComponent {

src/routes/Merchant/search.js

@@ -1,7 +1,7 @@
 import react, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
 import { Button, Form, Row, Col, Icon } from 'antd';
-import DataSearch from '../../components/DataSearch';
+import DataSearch from '../../../components/DataSearch';
 
 @Form.create()
 export default class Search extends PureComponent {
@@ -40,7 +40,7 @@ export default class Search extends PureComponent {
           <DataSearch { ...searchGroupProps } />
         </Col>
         <Col lg={{ offset: 7, span: 7 }} md={12} sm={8} xs={24} style={{ marginBottom: 16, textAlign: 'right' }}>
-          <Button type="ghost" onClick={onAdd}><Icon type="plus-circle" />添加</Button>
+          <Button type="primary" onClick={onAdd}><Icon type="plus-circle" />创建厂商</Button>
         </Col>
       </Row>
     );

src/routes/Merchant/table.js

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

src/routes/Merchant/table.less

@@ -1,5 +1,5 @@
 @import "~antd/lib/style/themes/default.less";
-@import "../../utils/utils.less";
+@import "../../../utils/utils.less";
 
 .table {
   .ant-table-tbody > tr > td,

src/routes/Order/index.js

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

src/routes/Order/search.js

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

src/routes/Order/table.js

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

src/routes/Order/table.less

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

src/routes/Support/index.js

@@ -6,8 +6,8 @@ import { routerRedux } from 'dva/router';
 import { Card } from 'antd';
 import TableList from './table';
 import Search from './search';
-import PageHeaderLayout from '../../layouts/PageHeaderLayout';
-import { Codes } from '../../utils/config';
+import PageHeaderLayout from '../../../layouts/PageHeaderLayout';
+import { Codes } from '../../../utils/config';
 
 @connect(state => ({ support: state.support }))
 export default class Support extends PureComponent {

src/routes/Support/search.js

@@ -1,7 +1,7 @@
 import react, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
 import { Button, Form, Row, Col, Icon } from 'antd';
-import DataSearch from '../../components/DataSearch';
+import DataSearch from '../../../components/DataSearch';
 
 @Form.create()
 export default class Search extends PureComponent {
@@ -40,7 +40,7 @@ export default class Search extends PureComponent {
           <DataSearch { ...searchGroupProps } />
         </Col>
         <Col lg={{ offset: 7, span: 7 }} md={12} sm={8} xs={24} style={{ marginBottom: 16, textAlign: 'right' }}>
-          <Button type="primary" onClick={onAdd}><Icon type="plus-circle" />新建配套</Button>
+          <Button type="primary" onClick={onAdd}><Icon type="plus-circle" />创建配套</Button>
         </Col>
       </Row>
     );

src/routes/Support/table.js

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

src/routes/Support/table.less

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

src/routes/Tag/List/search.js

@@ -41,7 +41,7 @@ export default class Search extends PureComponent {
           <DataSearch { ...searchGroupProps } />
         </Col>
         <Col lg={{ offset: 7, span: 7 }} md={12} sm={8} xs={24} style={{ marginBottom: 16, textAlign: 'right' }}>
-          <Button type="primary" onClick={onAdd}><Icon type="plus-circle" />新建标签</Button>
+          <Button type="primary" onClick={onAdd}><Icon type="plus-circle" />创建标签</Button>
         </Col>
       </Row>
     );

src/routes/TagGroup/List/search.js

@@ -41,7 +41,7 @@ export default class Search extends PureComponent {
           <DataSearch { ...searchGroupProps } />
         </Col>
         <Col lg={{ offset: 7, span: 7 }} md={12} sm={8} xs={24} style={{ marginBottom: 16, textAlign: 'right' }}>
-          <Button type="primary" onClick={onAdd}><Icon type="plus-circle" />新建标签组</Button>
+          <Button type="primary" onClick={onAdd}><Icon type="plus-circle" />创建标签组</Button>
         </Col>
       </Row>
     );

src/routes/Terminal/search.js

@@ -36,7 +36,7 @@ const Search = ({
         <DataSearch { ...searchGroupProps } />
       </Col>
       <Col lg={{ offset: 7, span: 7 }} md={12} sm={8} xs={24} style={{ marginBottom: 16, textAlign: 'right' }}>
-        <Button type="ghost" onClick={onAdd}><Icon type="plus-circle" />添加</Button>
+        <Button type="primary" onClick={onAdd}><Icon type="plus-circle" />添加终端</Button>
       </Col>
     </Row>
   )

src/routes/Ware/index.js

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

src/routes/Ware/search.js

@@ -1,7 +1,7 @@
 import react, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
 import { Button, Form, Row, Col, Icon } from 'antd';
-import DataSearch from '../../components/DataSearch';
+import DataSearch from '../../../components/DataSearch';
 
 @Form.create()
 export default class Search extends PureComponent {
@@ -40,7 +40,7 @@ export default class Search extends PureComponent {
           <DataSearch { ...searchGroupProps } />
         </Col>
         <Col lg={{ offset: 7, span: 7 }} md={12} sm={8} xs={24} style={{ marginBottom: 16, textAlign: 'right' }}>
-          <Button type="primary" onClick={onAdd}><Icon type="plus-circle" />新建课件</Button>
+          <Button type="primary" onClick={onAdd}><Icon type="plus-circle" />创建课件</Button>
         </Col>
       </Row>
     );

src/routes/Ware/table.js

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

src/routes/Ware/table.less

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

src/utils/config.js

@@ -29,7 +29,7 @@ Codes.CODE_SEASON = '季';
 Codes.CODE_ITEM = '件';
 
 module.exports = {
-  apiHost: 'http://lj.dev.cms.api.com:8500',
+  apiHost: 'http://lj.dev.cms.api.com:8100',
   // apiHost: '/api',
   // 每页返回数据量
   pageSize: 10,
@@ -80,7 +80,7 @@ module.exports = {
     [Codes.CODE_PAID]: '已支付',
     [Codes.CODE_CANCEL]: '已作废',
   },
-  // 计价单位
+  // 计价单位 名字: 时长
   chargeUnit: {
     [Codes.CODE_SEASON]: 90,
     [Codes.CODE_YEAR]: 365,