渠道厂商增加推荐位管理

src/common/menu.js

@@ -77,11 +77,11 @@ const menuData = [
     icon: 'desktop',
     path: 'terminal',
     children: [{
-      name: '终端用户',
-      path: 'user',
-    },{
       name: '校区管理',
       path: 'campus',
+    },{
+      name: '终端用户',
+      path: 'user',
     }],
   },{
     name: '账户管理',

src/common/router.js

@@ -43,7 +43,7 @@ export const getRouterData = (app) => {
       component: dynamicWrapper(app, ['resource'], () => import('../routes/Resource/video')),
     },
     '/terminal/campus': {
-      component: dynamicWrapper(app, ['campus'], () => import('../routes/Campus')),
+      component: dynamicWrapper(app, ['campus', 'merchant/merchant'], () => import('../routes/Campus')),
     },
     '/terminal/user': {
       component: dynamicWrapper(app, ['terminal'], () => import('../routes/Terminal')),
@@ -52,12 +52,12 @@ export const getRouterData = (app) => {
       component: dynamicWrapper(app, ['merchant/merchant'], () => import('../routes/Merchant/List')),
     },
     '/merchant/add': {
-      component: dynamicWrapper(app, ['merchant/detail'], () => import('../routes/Merchant/Edit')),
-      name: '创建厂商',
+      component: dynamicWrapper(app, ['merchant/detail', 'mproduct/mproduct'], () => import('../routes/Merchant/Edit')),
+      name: '添加厂商',
     },
     '/merchant/edit/:id': {
-      component: dynamicWrapper(app, ['merchant/detail'], () => import('../routes/Merchant/Edit')),
-      name: '修改厂商',
+      component: dynamicWrapper(app, ['merchant/detail', 'mproduct/mproduct'], () => import('../routes/Merchant/Edit')),
+      name: '编辑厂商',
     },
     '/tag/tagGroup': {
       component: dynamicWrapper(app, ['group/group', 'merchant/merchant'], () => import('../routes/TagGroup/List')),

src/models/campus.js

@@ -1,4 +1,5 @@
 import { query, create, update } from '../services/campus';
+import { message } from 'antd';
 import modelExtend from 'dva-model-extend';
 import queryString from 'query-string';
 import { pageModel } from './common';
@@ -10,7 +11,6 @@ export default modelExtend(pageModel, {
 
   state: {
     currentItem: {},
-    itemLoading: false,
     listLoading: false,
     modalVisible: false,
     modalType: 'create',
@@ -49,18 +49,20 @@ export default modelExtend(pageModel, {
       }
       yield put({ type: 'changeLoading', payload: { listLoading: false }});
     },
-    * create ({ payload }, { call, put }) {
+    * create ({ payload, callback }, { call, put }) {
       const { data, success } = yield call(create, payload);
       if (success) {
+        message.success('创建成功!');
         yield put({ type: 'hideModal' });
-        yield put({ type: 'query' }, payload: { pageNo: 1, pageSize: config.pageSize });
+        if (callback) callback();
       }
     },
-    * update ({ payload }, { call, put }) {
+    * update ({ payload, callback }, { call, put }) {
       const { data, success } = yield call(update, payload);
       if (success) {
+        message.success('修改成功!');
         yield put({ type: 'hideModal' });
-        yield put({ type: 'query', payload: { pageNo: 1, pageSize: config.pageSize} });
+        if (callback) callback();
       }
     }
   },

src/models/combo/detail.js

@@ -1,4 +1,4 @@
-import { queryOne, create, update } from '../../services/combo';
+import { queryOne, createPackage, updatePackage } from '../../services/product';
 import { message } from 'antd';
 import pathToRegexp from 'path-to-regexp';
 import { Codes } from '../../utils/config';
@@ -42,15 +42,14 @@ export default {
       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(createPackage, payload);
       if (success) {
         yield put({ type: 'clearPage' });
         if (callback) callback();
       }
     },
     * update ({ payload, callback }, { call, put }) {
-      const { data, success } = yield call(update, payload);
+      const { data, success } = yield call(updatePackage, payload);
       if (success) {
         yield put({ type: 'clearPage' });
         if (callback) callback();
@@ -75,6 +74,27 @@ export default {
       return { ...state, ...payload };
     },
 
+    saveProducts(state, action) {
+      return {
+        ...state,
+        currentItem: {
+          ...state.currentItem,
+          products: [...action.payload],
+        },
+        modalShow: false,
+      };
+    },
+
+    savePrice(state, action) {
+      return {
+        ...state,
+        currentItem: {
+          ...state.currentItem,
+          products: [...action.payload],
+        },
+      };
+    },
+
     showModal(state, action) {
       return { ...state, ...action.payload, modalShow: true };
     },

src/models/merchant/detail.js

@@ -1,13 +1,18 @@
-import { queryOne } from '../../services/merchant';
+import { queryOne, create, update, queryMerchantRecommend, updateMerchantRecommend } from '../../services/merchant';
 import pathToRegexp from 'path-to-regexp';
+import { message } from 'antd';
 
 export default {
   namespace: 'merchantDetail',
 
   state: {
     filters: {},
+    operType: 'create',
     currentItem: {},
     itemLoading: false,
+    recommend: [],
+    recLoading: false,
+    recModalShow: false,
   },
 
   subscriptions: {
@@ -17,6 +22,17 @@ export default {
         if (match) {
           dispatch({ type: 'query', payload: { id: match[1] } });
           dispatch({ type: 'saveFilters', payload: state });
+          dispatch({
+            type: 'saveOperType',
+            payload: { operType: 'update' },
+          });
+        }
+        if (pathname === '/merchant/add') {
+          dispatch({ type: 'saveFilters', payload: state });
+          dispatch({
+            type: 'saveOperType',
+            payload: { operType: 'create' },
+          });
         }
       });
     }
@@ -27,23 +43,70 @@ 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(create, payload);
+      if (success) {
+        message.success('创建成功!');
+        if (callback) callback();
+      }
+    },
+    * update ({ payload, callback }, { call, put }) {
+      const { data, success } = yield call(update, payload);
+      if (success) {
+        message.success('修改成功!');
+        if (callback) callback();
+        yield put({ type: 'clearCache', payload: { currentItem: {} } });
+      }
+    },
+    * queryMerchantRecommend({ payload }, { call, put }) {
+      yield put({ type: 'changeLoading', payload: { recLoading: true } });
+      const { data, success } = yield call(queryMerchantRecommend, payload);
+      if (success) {
+        yield put({ type: 'queryRecommendSuccess', payload: data });
+      }
+      yield put({ type: 'changeLoading', payload: { recLoading: false } });
+    },
+    * updateMerchantRecommend({ payload, callback }, { call, put }) {
+      const { data, success } = yield call(updateMerchantRecommend, payload);
+      if (success) {
+        message.success('修改成功!');
+        if (callback) callback();
+        yield put({ type: 'clearCache', payload: { recommend: [] } });
+      }
+    },
   },
 
   reducers: {
-    changeLoading(state, { payload }) {
-      return { ...state, ...payload };
+    changeLoading(state, action) {
+      return { ...state, ...action.payload };
     },
-
-    querySuccess(state, { payload }) {
-      return { ...state, currentItem: payload };
+    querySuccess(state, action) {
+      return { ...state, currentItem: action.payload };
     },
-
-    saveFilters(state, { payload: filters }) {
-      return { ...state, filters };
+    queryRecommendSuccess(state, action) {
+      return { ...state, recommend: action.payload };
     },
+    saveFilters(state, action) {
+      return { ...state, filters: action.payload };
+    },
+    saveOperType(state, action) {
+      return { ...state, ...action.payload };
+    },
+    showRecModal(state, action) {
+      return { ...state, ...action.payload, recModalShow: true };
+    },
+    hideRecModal(state, action) {
+      return { ...state, ...action.payload, recModalShow: false };
+    },
+    saveRecResult(state, action) {
+      return { ...state, recommend: action.payload, recModalShow: false };
+    },
+    clearCache(state, action) {
+      return { ...state, ...action.payload };
+    }
   }
 }

src/routes/Campus/index.js

@@ -1,106 +1,150 @@
-import React from 'react';
+import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import queryString from 'query-string';
 import { connect } from 'dva';
 import { routerRedux } from 'dva/router';
 import { Card } from 'antd';
-import TableList from './table';
-import ModalForm from './modal';
+import CampusTableList from './table';
+import CampusModalForm from './modal';
 import Search from './search';
 import PageHeaderLayout from '../../layouts/PageHeaderLayout';
+import { Codes } from '../../utils/config';
 
-function Campus({ location, dispatch, campus }) {
-  location.query = queryString.parse(location.search);
-  const { query, pathname } = location;
-  const { field, keyword } = query;
-  const { list, listLoading, pagination, currentItem, itemLoading, modalVisible, modalType } = campus;
+@connect(state => ({
+  campus: state.campus,
+  merchant: state.merchant,
+}))
+export default class CampusList extends Component {
 
-  const modalProps = {
-    item: modalType === 'create' ? {} : currentItem,
-    visible: modalVisible,
-    maskClosable: false,
-    title: `${modalType === 'create' ? '添加校区' : '更新校区'}`,
-    wrapClassName: 'vertical-center-modal',
-    onOk (data) {
-      dispatch({
-        type: `campus/${modalType}`,
-        payload: data,
-      });
-    },
-    onCancel () {
-      dispatch({
-        type: 'campus/hideModal',
-      });
-    },
-  };
+  componentDidMount() {
+    this.props.dispatch({
+      type: 'merchant/query',
+      payload: {
+        pageNo: 1,
+        pageSize: 1000,
+        domain: Codes.CODE_PJ,
+      },
+    });
+  }
 
-  const searchProps = {
-    field,
-    keyword,
-    onSearch: (payload) => {
-      if (!payload.keyword.length) {
-        delete payload.field;
-        delete payload.keyword;
-      }
-      dispatch(routerRedux.push({
-        pathname,
-        search: queryString.stringify({
-          ...payload
-        })
-      }));
-    },
-    onAdd: () => {
-      dispatch({
-        type: 'campus/showModal',
-        payload: {
-          modalType: 'create',
-        },
-      });
-    }
-  };
-  const listProps = {
-    dataSource: list,
-    loading: listLoading,
-    pagination,
-    location,
-    onChange: (page) => {
-      dispatch(routerRedux.push({
-        pathname,
-        search: queryString.stringify({
-          ...query,
-          pageNo: page.current,
-          pageSize: page.pageSize,
-        }),
-      }));
-    },
-    onEditItem: (item) => {
-      dispatch({
-        type: 'campus/showModal',
-        payload: {
-          modalType: 'update',
-          currentItem: item,
-        },
-      })
-    },
-    onDeleteItem: () => {
-      //TODO: 暂不提供删除校区功能
+  render() {
+    const { location, dispatch, campus, merchant } = this.props;
+    const {
+      list,
+      listLoading,
+      pagination,
+      currentItem,
+      modalVisible,
+      modalType
+    } = campus;
+
+    location.query = queryString.parse(location.search);
+    const { query, pathname } = location;
+    const { field, keyword, ...filters } = query;
+
+    // 把携带的参数中空值项删除
+    Object.keys(filters).map(key => { filters[key] ? null : delete filters[key] });
+    // 如果搜索内容不为空则添加进filters中
+    if (field && keyword) {
+      filters.field = field;
+      filters.keyword = keyword;
     }
-  };
-  return (
-    <PageHeaderLayout>
-      <Card>
-        <Search { ...searchProps } />
-        <TableList { ...listProps } />
-        {modalVisible && <ModalForm { ...modalProps } />}
-      </Card>
-    </PageHeaderLayout>
-  );
-}
+    
+    const modalProps = {
+      item: modalType === 'create' ? {} : currentItem,
+      visible: modalVisible,
+      maskClosable: false,
+      merchants: merchant.list,
+      title: `${modalType === 'create' ? '添加校区' : '编辑校区'}`,
+      wrapClassName: 'vertical-center-modal',
+      onOk (data) {
+        dispatch({
+          type: `campus/${modalType}`,
+          payload: data,
+          callback: () => {
+            dispatch(routerRedux.push({
+              pathname: '/terminal/campus',
+              search: queryString.stringify(filters),
+            }));
+          }
+        });
+      },
+      onCancel () {
+        dispatch({
+          type: 'campus/hideModal',
+        });
+      },
+    };
 
-Campus.propTypes = {
-  campus: PropTypes.object,
-  location: PropTypes.object,
-  dispatch: PropTypes.func,
-}
+    const searchProps = {
+      field,
+      keyword,
+      onSearch: (payload) => {
+        if (!payload.keyword.length) {
+          delete payload.field;
+          delete payload.keyword;
+        }
+        dispatch(routerRedux.push({
+          pathname,
+          search: queryString.stringify({
+            ...payload
+          })
+        }));
+      },
+      onAdd: () => {
+        dispatch({
+          type: 'campus/showModal',
+          payload: { modalType: 'create' },
+        });
+      }
+    };
 
-export default connect(({ campus }) => ({ campus }))(Campus);
+    const listProps = {
+      curMerchant: filters.merchantId,
+      merchantList: merchant.list,
+      dataSource: list,
+      loading: listLoading,
+      pagination,
+      location,
+      onChange: (pagination, filterArgs) => {
+        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 = { ...filters, ...tableFilters };
+        Object.keys(data).map(key => data[key] ? null : delete data[key]);
+        dispatch(routerRedux.push({
+          pathname,
+          search: queryString.stringify({
+            ...data,
+            pageNo: pagination.current,
+            pageSize: pagination.pageSize,
+          }),
+        }));
+      },
+      onEditItem: (item) => {
+        dispatch({
+          type: 'campus/showModal',
+          payload: {
+            modalType: 'update',
+            currentItem: item,
+          },
+        });
+      },
+      onDeleteItem: () => {
+        //TODO: 暂不提供删除校区功能
+      }
+    };
+    return (
+      <PageHeaderLayout>
+        <Card>
+          <Search { ...searchProps } />
+          <CampusTableList { ...listProps } />
+          {modalVisible && <CampusModalForm { ...modalProps } />}
+        </Card>
+      </PageHeaderLayout>
+    );
+  }
+}

src/routes/Campus/modal.js

@@ -1,137 +1,128 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { Form, Cascader, Input, Modal, Icon } from 'antd';
+import React, { Component } from 'react';
+import { Form, Cascader, Select, Input, Modal, Icon } from 'antd';
 import * as city from '../../utils/city';
 
-const FormItem = Form.Item
+@Form.create()
+export default class CampusModalForm extends Component {
 
-const formItemLayout = {
-  labelCol: {
-    span: 7,
-  },
-  wrapperCol: {
-    span: 14,
-  },
-}
-
-const ModalForm = ({
-  item = {},
-  onOk,
-  form: {
-    getFieldDecorator,
-    getFieldsValue,
-    validateFields,
-  },
-  ...modalProps,
-}) => {
-  const handleOk = () => {
+  handleOnOk = () => {
+    const { onOk, form, item } = this.props;
+    const { validateFields, getFieldsValue } = form;
     validateFields((errors) => {
-      if (errors) {
-        return
-      }
-      const data = {
-        ...getFieldsValue(),
-      };
+      if (errors) return;
+      const data = { ...getFieldsValue() };
+
       data.provinceCode = city.provNameToCode(data.cascader[0]);
       data.cityName = data.cascader.slice(1, 3).join(' ');
       delete data.cascader;
       item.id ? data.id = item.id : null;
+
       onOk(data);
-    })
+    });
   }
 
-  const modalOpts = {
-    ...modalProps,
-    onOk: handleOk,
-  }
+  render() {
+    const { item, merchants, onOk, form, ...modalProps } = this.props;
+    const { getFieldDecorator } = form;
 
-  return (
-    <Modal {...modalOpts}>
-      <Form layout="horizontal">
-        <FormItem label="校区编号：" hasFeedback {...formItemLayout}>
-          {getFieldDecorator('code', {
-            initialValue: item.code,
-            rules: [
-              {
-                required: true,
-                message: '校区编号为必填项！',
-              },
-            ],
-          })(<Input disabled={item.code ? true : false}/>)}
-        </FormItem>
-        <FormItem label="校区地址" hasFeedback {...formItemLayout}>
-          {getFieldDecorator('cascader', {
-            rules: [
-              {
-                required: true,
-                message: '校区地址为必选项！'
-              }
-            ],
-            initialValue: item.provinceCode && [city.provCodeToName(item.provinceCode), ...(item.cityName || '').split(' ')],
-          })(<Cascader
-            style={{ width: '100%' }}
-            options={city.DICT_FIXED}
-            placeholder="请选择地址"
-          />)}
-        </FormItem>
-        <FormItem label="校区名称：" hasFeedback {...formItemLayout}>
-          {getFieldDecorator('zoneName', {
-            initialValue: item.zoneName,
-            rules: [
-              {
-                required: true,
-                message: '校区名称为必填项！',
-              },
-            ],
-          })(<Input placeholder="只填写学校名称即可"/>)}
-        </FormItem>
-        <FormItem label="联系人：" hasFeedback {...formItemLayout}>
-          {getFieldDecorator('contactName', {
-            initialValue: item.contactName,
-            rules: [
-              {
-                required: true,
-                message: '联系人为必填项！',
-              },
-            ],
-          })(<Input />)}
-        </FormItem>
-        <FormItem label="联系电话：" hasFeedback {...formItemLayout}>
-          {getFieldDecorator('mobile', {
-            initialValue: item.mobile,
-            rules: [
-              {
-                required: true,
-                message: '联系电话为必填项！',
-              },
-            ],
-          })(<Input />)}
-        </FormItem>
-        <FormItem label="收货地址" hasFeedback {...formItemLayout}>
-          {getFieldDecorator('address', {
-            initialValue: item.address,
-          })(<Input />)}
-        </FormItem>
-        <FormItem label="银行账户" hasFeedback {...formItemLayout}>
-          {getFieldDecorator('bankAccount', {
-            initialValue: item.bankAccount,
-          })(<Input />)}
-        </FormItem>
-        <FormItem label="开户行名称" hasFeedback {...formItemLayout}>
-          {getFieldDecorator('depositBank', {
-            initialValue: item.depositBank,
-          })(<Input />)}
-        </FormItem>
-      </Form>
-    </Modal>
-  )
-}
+    const formItemLayout = {
+      labelCol: { span: 7 },
+      wrapperCol: { span: 14 },
+    };
 
-ModalForm.propTypes = {
-  item: PropTypes.object,
-  form: PropTypes.object,
-  type: PropTypes.string,
-  onOk: PropTypes.func,
-}
+    const modalOpts = { ...modalProps, onOk: this.handleOnOk }
 
-export default Form.create()(ModalForm);
+    return (
+      <Modal {...modalOpts}>
+        <Form layout="horizontal">
+          <Form.Item label="渠道名称" hasFeedback {...formItemLayout}>
+            {getFieldDecorator('merchantId', {
+              rules: [{ required: true, type: 'string', message: "该项为必选项!" }],
+              initialValue: item.merchantId,
+            })(
+              <Select
+                showSearch
+                allowClear
+                placeholder="请选择"
+                optionFilterProp="children"
+                filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
+              >
+                {merchants.map(selItem => <Select.Option value={selItem.id} key={selItem.id}>{`${selItem.code}/${selItem.name}`}</Select.Option>)}
+              </Select>
+            )}
+          </Form.Item>
+          <Form.Item label="校区地址" hasFeedback {...formItemLayout}>
+            {getFieldDecorator('cascader', {
+              rules: [
+                {
+                  required: true,
+                  message: '校区地址为必选项！'
+                }
+              ],
+              initialValue: item.provinceCode && [city.provCodeToName(item.provinceCode), ...(item.cityName || '').split(' ')],
+            })(<Cascader
+              style={{ width: '100%' }}
+              options={city.DICT_FIXED}
+              placeholder="请选择"
+            />)}
+          </Form.Item>
+          {/*校区编号暂不显示
+          <Form.Item label="校区编号：" {...formItemLayout}>
+            {getFieldDecorator('code', {
+              initialValue: item.code,
+            })(<Input disabled={true} placeholder="提交后根据校区地址自动生成"/>)}
+          </Form.Item>
+          */}
+          <Form.Item label="校区名称：" hasFeedback {...formItemLayout}>
+            {getFieldDecorator('zoneName', {
+              initialValue: item.zoneName,
+              rules: [
+                {
+                  required: true,
+                  message: '校区名称为必填项！',
+                },
+              ],
+            })(<Input placeholder="请填写"/>)}
+          </Form.Item>
+          <Form.Item label="联系人：" hasFeedback {...formItemLayout}>
+            {getFieldDecorator('contactName', {
+              initialValue: item.contactName,
+              rules: [
+                {
+                  required: true,
+                  message: '联系人为必填项！',
+                },
+              ],
+            })(<Input />)}
+          </Form.Item>
+          <Form.Item label="联系电话：" hasFeedback {...formItemLayout}>
+            {getFieldDecorator('mobile', {
+              initialValue: item.mobile,
+              rules: [
+                {
+                  required: true,
+                  message: '联系电话为必填项！',
+                },
+              ],
+            })(<Input />)}
+          </Form.Item>
+          <Form.Item label="收货地址" hasFeedback {...formItemLayout}>
+            {getFieldDecorator('address', {
+              initialValue: item.address,
+            })(<Input />)}
+          </Form.Item>
+          <Form.Item label="银行账户" hasFeedback {...formItemLayout}>
+            {getFieldDecorator('bankAccount', {
+              initialValue: item.bankAccount,
+            })(<Input />)}
+          </Form.Item>
+          <Form.Item label="开户行名称" hasFeedback {...formItemLayout}>
+            {getFieldDecorator('depositBank', {
+              initialValue: item.depositBank,
+            })(<Input />)}
+          </Form.Item>
+        </Form>
+      </Modal>
+    )
+  }
+}

src/routes/Campus/search.js

@@ -18,10 +18,6 @@ const Search = ({
       value: 'name', name: '校区名称'
     },{
       value: 'code', name: '校区编号'
-    },{
-      value: 'contactName', name: '联系人'
-    },{
-      value: 'mobile', name: '电话',
     }],
     selectProps: {
       defaultValue: field || 'name',
@@ -36,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/Campus/table.js

@@ -1,87 +1,98 @@
-import React from 'react';
-import PropTypes from 'prop-types';
+import React, { Component } from 'react';
 import moment from 'moment';
 import classnames from 'classnames';
-import queryString from 'query-string';
-import { Modal, Table, Menu, Icon } from 'antd';
+import { Modal, Table } from 'antd';
 import AnimTableBody from '../../components/Animation/AnimTableBody';
 import styles from './table.less';
 
 const confirm = Modal.confirm;
 
-const TableList = ({ onDeleteItem, onEditItem, location, pagination, ...tableProps }) => {
-  // 从url中提取查询参数
-  location.query = queryString.parse(location.search);
-  // 暂不支持删除校区
-  const handleDeleteItem = (record) => {
+export default class CampusTableList extends Component {
+
+  handleDeleteItem = (record) => {
     confirm({
-      title: '您确定要删除这条记录吗?',
+      title: '您确定要删除该校区吗?',
       onOk () {
-        onDeleteItem(record.id)
+        onDeleteItem(record.id);
       },
-    })
+    });
   }
-  const columns = [{
-    title: '校区编号',
-    dataIndex: 'code',
-    key: 'code',
-  },{
-    title: '校区名称',
-    dataIndex: 'name',
-    key: 'name',
-  },{
-    title: '联系人',
-    dataIndex: 'contactName',
-    key: 'contactName',
-  },{
-    title: '电话',
-    dataIndex: 'mobile',
-    key: 'mobile',
-  },{
-    title: '地址',
-    dataIndex: 'address',
-    key: 'address',
-  },{
-    title: '添加时间',
-    dataIndex: 'gmtCreated',
-    key: 'gmtCreated',
-    render: (text, record) => (
-      <div>{moment(text).format('YYYY-MM-DD')}</div>
-    )
-  },{
-    title: '操作',
-    dataIndex: 'operation',
-    key: 'operation',
-    render: (text, record) => (
-      <div>
-        <a onClick={() => onEditItem(record)}>编辑</a>
-      </div>
-    )
-  }];
-  tableProps.pagination = !!pagination && { ...pagination, showSizeChanger: true, showQuickJumper: true, showTotal: total => `共 ${total} 条`};
-  const getBodyWrapperProps = {
-    page: location.query.page,
-    current: tableProps.pagination.current,
-  };
-  const getBodyWrapper = (body) => (<AnimTableBody {...getBodyWrapperProps} body={body} />);
-  return (
-    <Table
-      simple
-      bordered
-      { ...tableProps }
-      columns={columns}
-      className={classnames({ [styles.table]: true, [styles.motion]: true })}
-      rowKey={record => record.id}
-      getBodyWrapper={getBodyWrapper}
-    />
-  );
-}
 
-TableList.propTypes = {
-  location: PropTypes.object,
-  onChange: PropTypes.func.isRequired,
-  onDeleteItem: PropTypes.func.isRequired,
-  onEditItem: PropTypes.func.isRequired,
-}
+  render() {
+    const {
+      onDeleteItem,
+      onEditItem,
+      location,
+      pagination,
+      curMerchant,
+      merchantList = [],
+      ...tableProps
+    } = this.props;
+
+    const columns = [{
+      title: '校区编号',
+      dataIndex: 'code',
+      key: 'code',
+    },{
+      title: '校区名称',
+      dataIndex: 'name',
+      key: 'name',
+    },{
+      title: '渠道名称',
+      dataIndex: 'merchantId',
+      key: 'merchantId',
+      render: (text, record) => record.merchantName,
+      filters: merchantList.map(item => ({ text: item.name, value: item.id })),
+      filterMultiple: false,
+      filteredValue: [curMerchant],
+    },{
+      title: '联系人',
+      dataIndex: 'contactName',
+      key: 'contactName',
+    },{
+      title: '电话',
+      dataIndex: 'mobile',
+      key: 'mobile',
+    },{
+      title: '修改时间',
+      dataIndex: 'gmtModified',
+      key: 'gmtModified',
+      render: (text, record) => (
+        <div>{moment(text).format('YYYY-MM-DD HH:mm:ss')}</div>
+      )
+    },{
+      title: '操作',
+      dataIndex: 'operation',
+      key: 'operation',
+      render: (text, record) => (
+        <div>
+          <a onClick={() => onEditItem(record)}>编辑</a>
+        </div>
+      )
+    }];
 
-export default TableList;
+    // 数据table列表表头的筛选按钮点击重置后status与domain值为空，此时删除该参数
+    columns.map(item => {
+      item.dataIndex === 'merchantId' && !curMerchant ? delete item.filteredValue : null;
+    });
+
+    tableProps.pagination = !!pagination && { ...pagination, showSizeChanger: true, showQuickJumper: true, showTotal: total => `共 ${total} 条`};
+    const getBodyWrapperProps = {
+      page: tableProps.pagination.page,
+      current: tableProps.pagination.current,
+    };
+    const getBodyWrapper = (body) => (<AnimTableBody {...getBodyWrapperProps} body={body} />);
+
+    return (
+      <Table
+        simple
+        bordered
+        { ...tableProps }
+        columns={columns}
+        className={classnames({ [styles.table]: true, [styles.motion]: true })}
+        rowKey={record => record.id}
+        getBodyWrapper={getBodyWrapper}
+      />
+    );
+  }
+}

src/routes/Campus/table.less

@@ -23,7 +23,7 @@
       }
 
       &:nth-child(4) {
-        width: 18%;
+        width: 10%;
       }
 
       &:nth-child(5) {
@@ -31,11 +31,11 @@
       }
 
       &:nth-child(6) {
-        width: 12%;
+        width: 14%;
       }
 
       &:nth-child(7) {
-        width: 8%;
+        width: 14%;
       }
     }
 

src/routes/Combo/Edit/index.js

@@ -1,9 +1,11 @@
 import React, { PureComponent } from 'react';
 import { connect } from 'dva';
 import { routerRedux } from 'dva/router';
-import { Card, Table, Form, Spin, Input, Button, Icon } from 'antd';
+import { Card, Table, Form, Spin, Input, InputNumber, Button, Icon, message } from 'antd';
+import queryString from 'query-string';
 import PageHeaderLayout from '../../../layouts/PageHeaderLayout';
 import ProductSelectModal from './product';
+import { Codes, pageSize } from '../../../utils/config';
 
 @Form.create()
 @connect(state => ({
@@ -14,23 +16,125 @@ export default class PackageProfile extends PureComponent {
 
   handleEditProuctClick = () => {
     this.props.dispatch({ type: 'comboDetail/showModal' });
-    this.props.dispatch({ type: 'product/query' });
+    this.props.dispatch({
+      type: 'product/query',
+      payload: {
+        type: Codes.CODE_COURSE,
+        status: Codes.CODE_NORMAL,
+        pageNo: 1,
+        pageSize,
+      }
+    });
   }
 
-  handleProductModalOk = () => {
+  handleInputNumberChange = (value, record) => {
+    const { currentItem } = this.props.comboDetail;
+    const { products } = currentItem;
+    const boundPriceProducts = [...products];
+    boundPriceProducts.map(item => item.pid === record.pid ? item.cpPrice = value : null);
+    this.props.dispatch({
+      type: 'comboDetail/savePrice',
+      payload: boundPriceProducts,
+    });
+  }
 
+  handleProductModalOk = (data) => {
+    this.props.dispatch({
+      type: 'comboDetail/saveProducts',
+      payload: data ,
+    });
   }
 
   handleProductModalCancel = () => {
     this.props.dispatch({ type: 'comboDetail/hideModal' });
   }
 
-  handleProductModalSearch = () => {
+  handleProductModalSearch = (data) => {
+    const newData = { ...data };
+    if (newData.keyword) {
+      newData[newData.field] = newData.keyword;
+    }
+    delete newData.field;
+    delete newData.keyword;
+    this.props.dispatch({
+      type: 'product/query',
+      payload: {
+        type: Codes.CODE_COURSE,
+        status: Codes.CODE_NORMAL,
+        pageNo: 1,
+        pageSize,
+      }
+    });
+  }
+
+  handleProductModalTableChange = (pagination, filterArgs, filters) => {
+    const newFilters = { ...filters };
+    if (newFilters.keyword) {
+      newFilters[newFilters.field] = newFilters.keyword;
+    }
+    delete newFilters.field;
+    delete newFilters.keyword;
 
+    const data = {
+      ...newFilters,
+      pageNo: pagination.current,
+      pageSize: pagination.pageSize,
+      status: Codes.CODE_NORMAL,
+    };
+
+    Object.keys(data).map(key => data[key] ? null : delete data[key]);
+    dispatch({ type: 'product/query', payload: data });
   }
 
-  handleProductModalTableChange = () => {
+  handlePageCancel = () => {
+    const { filters } = this.props.comboDetail;
+    this.props.dispatch(routerRedux.push({
+      pathname: '/product/package',
+      search: queryString.stringify(filters),
+    }));
+  }
 
+  handlePageSubmit = (e) => {
+    e.preventDefault();
+    const { dispatch, form, comboDetail } = this.props;
+    const { currentItem, operType, filters } = comboDetail;
+    const { products } = currentItem;
+    const { validateFields, getFieldsValue } = form;
+    validateFields((errors) => {
+      if (errors) return;
+      if (products && products.filter(item => !item.cpPrice).length > 0 ) {
+        message.error('还有供应商价格未填写!');
+        return;
+      }
+      // add params `code` and `name`
+      const data = { ...getFieldsValue() };
+      // add params `products`
+      if (Array.isArray(products)) {
+        data.products = products.map(item => ({
+          pid: item.pid,
+          type: item.type,
+          cpPrice: item.cpPrice,
+        }));
+      }
+      // add params `status`
+      if (operType === 'create') {
+        data.status = Codes.CODE_NORMAL;
+      }
+      else if (operType === 'update') {
+        data.status = currentItem.status;
+        data.id = currentItem.id;
+      }
+      dispatch({
+        type: `comboDetail/${operType}`,
+        payload: data,
+        callback: () => {
+          dispatch(routerRedux.push({
+            pathname: '/product/package',
+            search: queryString.stringify(filters),
+          }));
+        }
+      });
+    });
   }
 
   render() {
@@ -77,13 +181,22 @@ export default class PackageProfile extends PureComponent {
       title: '供应商价格',
       dataIndex: 'cpPrice',
       key: 'cpPrice',
+      render: (text, record) => (
+        <InputNumber
+          min={0}
+          value={record.cpPrice}
+          onChange={(value) => this.handleInputNumberChange(value, record)}
+          formatter={value => `¥ ${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')}
+          parser={value => value.replace(/\¥\s?|(,*)/g, '')}
+        />
+      ),
     }];
 
     return (
       <PageHeaderLayout>
         <Spin spinning={itemLoading}>
           <Card>
-            <Form layout="horizontal">
+            <Form layout="horizontal" onSubmit={this.handlePageSubmit}>
               <Form.Item label="产品包编号" { ...formItemLayout }>
                 {getFieldDecorator('code', {
                   rules: [{ required: true, type: 'string', message: '编号为必填项!' }],
@@ -102,12 +215,12 @@ export default class PackageProfile extends PureComponent {
                   simple
                   bordered
                   columns={columns}
-                  dataSource={[]}
+                  dataSource={products || []}
                   pagination={false}
                   rowKey={record => record.id}
                   locale={{
                     emptyText: <span style={{ color: "#C6D0D6" }}>&nbsp;&nbsp;<Icon type="frown-o"/>
-                      该产品包内暂无相关产品，请选择!</span>
+                      该产品包内暂无相关产品!</span>
                   }}
                 />
               </Form.Item>

src/routes/Combo/Edit/product.js

@@ -50,64 +50,40 @@ export default class ProductSelectModal extends PureComponent {
       tableDataSource: selTableData,
       rowKeyName: rowKeyName,
       tableColumns: [{
-        title: '封面图片',
-        dataIndex: 'coverUrl',
-        key: 'coverUrl',
-        width: '22%'
-      },{
         title: '产品编号',
         dataIndex: 'code',
         key: 'code',
-        width: '22%',
+        width: '30%',
       },{
         title: '产品名称',
         dataIndex: 'name',
         key: 'name',
-        width: '22%',
+        width: '30%',
       },{
         title: '供应商',
         dataIndex: 'cpName',
         key: 'cpName',
-        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, '')}
-      //     />
-      //   ),
+        width: '20%',
       }]
     };
 
     //待选资源Table属性
     const fsTableProps = {
       fsTableColumns: [{
-        title: '封面图片',
-        dataIndex: 'coverUrl',
-        key: 'coverUrl',
-        width: '22%'
-      },{
         title: '产品编号',
         dataIndex: 'code',
         key: 'code',
-        width: '22%%',
+        width: '30%',
       },{
         title: '产品名称',
         dataIndex: 'name',
         key: 'name',
-        width: '22%',
+        width: '30%',
       },{
         title: '供应商',
         dataIndex: 'cpName',
         key: 'cpName',
-        width: '22%',
+        width: '20%',
       }],
       ...fsTableOpts,
     }

src/routes/Merchant/Edit/baseInfo.js

@@ -1,20 +1,31 @@
 import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
-import { Card, Form, Switch, Radio, Button, Input } from 'antd';
-import { domains } from '../../../utils/config';
-
-const FormItem = Form.Item;
-const RadioGroup = Radio.Group;
+import { Spin, Card, Form, Switch, Radio, Button, Input } from 'antd';
+import { domains, Codes } from '../../../utils/config';
 
 @Form.create()
 export default class BaseInfoCard extends PureComponent {
   static propTypes = {
     form: PropTypes.object.isRequired,
     item: PropTypes.object.isRequired,
+    loading: PropTypes.bool.isRequired,
+    onSubmit: PropTypes.func.isRequired,
+    onCancel: PropTypes.func.isRequired,
   };
 
+  handleSubmit = (e) => {
+    e.preventDefault();
+    const { form, onSubmit } = this.props;
+    const { getFieldsValue, validateFields } = form;
+    validateFields((errors) => {
+      if (errors) return;
+      const data = { ...getFieldsValue() };
+      onSubmit(data);
+    });
+  }
+
   render() {
-    const { form: { getFieldDecorator }, item, onCancel } = this.props;
+    const { form: { getFieldDecorator }, item, loading, onCancel } = this.props;
 
     const formItemLayout = {
       labelCol: {
@@ -35,63 +46,73 @@ export default class BaseInfoCard extends PureComponent {
       },
     };
 
-
     return (
-      <Card title="基础信息">
-        <Form layout="horizontal">
-          <FormItem label="厂商编号" hasFeedback {...formItemLayout}>
-            {getFieldDecorator('code',{
-              rules: [{ required: true, type: 'string', message: '编号为必填写!' }],
-              initialValue: item.code,
-            })(<Input />)}
-          </FormItem>
-          <FormItem label="厂商名称" hasFeedback {...formItemLayout}>
-            {getFieldDecorator('name',{
-              rules: [{ required: true, type: 'string', message: '名称为必填项!' }],
-              initialValue: item.name,
-            })(<Input />)}
-          </FormItem>
-          <FormItem label="厂商类型" {...formItemLayout}>
-            {getFieldDecorator('domain',{
-              initialValue: item.domain || 2010,
-            })(<RadioGroup>{Object.keys(domains).map(key => <Radio value={Number(key)} key={`domain-${key}`}>{domains[key]}</Radio>)}</RadioGroup>)}
-          </FormItem>
-          <FormItem label="开户银行" hasFeedback {...formItemLayout}>
-            {getFieldDecorator('depositBank',{
-              initialValue: item.depositBank,
-            })(<Input />)}
-          </FormItem>
-          <FormItem label="银行账户" hasFeedback {...formItemLayout}>
-            {getFieldDecorator('bankAccount',{
-              initialValue: item.bankAccount,
-            })(<Input />)}
-          </FormItem>
-          <FormItem label="营业执照编号" hasFeedback {...formItemLayout}>
-            {getFieldDecorator('licenseId',{
-              initialValue: item.licenseId,
-            })(<Input />)}
-          </FormItem>
-          <FormItem label="纳税人识别号" hasFeedback {...formItemLayout}>
-            {getFieldDecorator('taxNumber',{
-              initialValue: item.taxNumber,
-            })(<Input />)}
-          </FormItem>
-          <FormItem label="发票类型" {...formItemLayout}>
-            {getFieldDecorator('receiptType', {
-              initialValue: item.receiptType || 'SPECIAL',
-            })(
-              <RadioGroup>
-                <Radio value="COMMON" key="receipt-com">普通发票</Radio>
-                <Radio value="SPECIAL" key="receipt-spl">增值税发票</Radio>
-              </RadioGroup>
-            )}
-          </FormItem>
-          <FormItem {...submitFormLayout} style={{ marginTop: 32 }}>
-            <Button onClick={onCancel}>取消</Button>
-            <Button type="primary" style={{ marginLeft: 35 }} htmlType="submit">提交</Button>
-          </FormItem>
-        </Form>
-      </Card>
+      <Spin spinning={loading}>
+        <Card>
+          <Form layout="horizontal" onSubmit={this.handleSubmit}>
+            <Form.Item label="厂商编号" hasFeedback {...formItemLayout}>
+              {getFieldDecorator('code',{
+                rules: [{ required: true, type: 'string', message: '编号为必填写!' }],
+                initialValue: item.code,
+              })(<Input />)}
+            </Form.Item>
+            <Form.Item label="厂商名称" hasFeedback {...formItemLayout}>
+              {getFieldDecorator('name',{
+                rules: [{ required: true, type: 'string', message: '名称为必填项!' }],
+                initialValue: item.name,
+              })(<Input />)}
+            </Form.Item>
+            <Form.Item label="厂商类型" {...formItemLayout}>
+              {getFieldDecorator('domain',{
+                initialValue: item.domain || 2010,
+              })(
+                <Radio.Group>
+                  {Object.keys(domains).map(key =>
+                    Number(key) === Codes.CODE_LJ ? null :
+                      <Radio value={Number(key)} key={`domain-${key}`}>{domains[key]}</Radio>
+                  )}
+                </Radio.Group>
+              )}
+            </Form.Item>
+            <Form.Item label="开户银行" hasFeedback {...formItemLayout}>
+              {getFieldDecorator('depositBank',{
+                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: '银行账户为必填项!' }],
+                initialValue: item.bankAccount,
+              })(<Input />)}
+            </Form.Item>
+            <Form.Item label="营业执照编号" hasFeedback {...formItemLayout}>
+              {getFieldDecorator('licenseId',{
+                initialValue: item.licenseId,
+              })(<Input />)}
+            </Form.Item>
+            <Form.Item label="纳税人识别号" hasFeedback {...formItemLayout}>
+              {getFieldDecorator('taxNumber',{
+                initialValue: item.taxNumber,
+              })(<Input />)}
+            </Form.Item>
+            <Form.Item label="发票类型" {...formItemLayout}>
+              {getFieldDecorator('receiptType', {
+                initialValue: item.receiptType || 'SPECIAL',
+              })(
+                <Radio.Group>
+                  <Radio value="COMMON" key="receipt-com">普通发票</Radio>
+                  <Radio value="SPECIAL" key="receipt-spl">增值税发票</Radio>
+                </Radio.Group>
+              )}
+            </Form.Item>
+            <Form.Item {...submitFormLayout} style={{ marginTop: 32 }}>
+              <Button onClick={onCancel}>取消</Button>
+              <Button type="primary" style={{ marginLeft: 35 }} htmlType="submit">提交</Button>
+            </Form.Item>
+          </Form>
+        </Card>
+      </Spin>
     );
   }
 }

src/routes/Merchant/Edit/index.js

@@ -3,37 +3,166 @@ import { routerRedux } from 'dva/router';
 import PropTypes from 'prop-types';
 import queryString from 'query-string';
 import { connect } from 'dva';
-import { Spin, Card, Form } from 'antd';
 import PageHeaderLayout from '../../../layouts/PageHeaderLayout';
 import BaseInfoCard from './baseInfo';
 import RecommendList from './recommend';
+import { Codes, pageSize } from '../../../utils/config';
 
-@connect(state => ({ merchantDetail: state.merchantDetail }))
+@connect(state => ({
+  mproduct: state.mproduct,
+  merchantDetail: state.merchantDetail,
+}))
 export default class MerchantDetail extends PureComponent {
   static propTypes = {
     merchantDetail: PropTypes.object,
+    mproduct: PropTypes.object,
   };
 
   state = { curTab: 'baseInfo' };
 
   handleTabChange = (key) => {
     this.setState({ curTab: key });
+    if (key === 'recommend') {
+      const { merchantDetail } = this.props;
+      const { currentItem } = merchantDetail;
+      const { id } = currentItem;
+      this.props.dispatch({
+        type: 'merchantDetail/queryMerchantRecommend',
+        payload: { id },
+      });
+    }
   }
 
-  render() {
+  handleRecommendAdjustClick = () => {
+    const { merchantDetail } = this.props;
+    const { currentItem } = merchantDetail;
+    const { id } = currentItem;
+    this.props.dispatch({ type: 'merchantDetail/showRecModal' });
+    this.props.dispatch({
+      type: 'mproduct/query',
+      payload: {
+        merchantId: id,
+        pageNo: 1,
+        pageSize,
+      },
+    });
+  }
+
+  handleRecommendModalCancel = () => {
+    this.props.dispatch({ type: 'merchantDetail/hideRecModal' });
+  }
+
+  handleRecommendModalOk = (data) => {
+    this.props.dispatch({
+      type: 'merchantDetail/saveRecResult',
+      payload: data,
+    });
+  }
+
+  handleRecommendModalSearch = (data) => {
+    const { merchantDetail } = this.props;
+    const { currentItem } = merchantDetail;
+    const { id } = currentItem;
+    const newData = { ...data };
+    if (newData.keyword) {
+      newData[newData.field] = newData.keyword;
+    }
+    delete newData.field;
+    delete newData.keyword;
+    this.props.dispatch({
+      type: 'mproduct/query',
+      payload: {
+        pageNo: 1,
+        pageSize,
+        merchantId: id,
+      }
+    });
+  }
+
+  handleRecommendModalTableChange = (pagination, filterArgs, filters) => {
+    const { merchantDetail } = this.props;
+    const { currentItem } = merchantDetail;
+    const { id } = currentItem;
+    const newFilters = { ...filters };
+    if (newFilters.keyword) {
+      newFilters[newFilters.field] = newFilters.keyword;
+    }
+    delete newFilters.field;
+    delete newFilters.keyword;
+
+    const data = {
+      ...newFilters,
+      pageNo: pagination.current,
+      pageSize: pagination.pageSize,
+      merchantId: id,
+    };
+
+    Object.keys(data).map(key => data[key] ? null : delete data[key]);
+    dispatch({ type: 'mproduct/query', payload: data });
+  }
+
+  handleRecommendPageCancel = () => {
     const { dispatch, merchantDetail } = this.props;
-    const { itemLoading, currentItem, filters } = merchantDetail;
+    const { filters } = merchantDetail;
+    dispatch(
+      routerRedux.push({
+        pathname: '/merchant',
+        search: queryString.stringify(filters)
+      })
+    );
+    dispatch({
+      type: 'merchantDetail/clearCache',
+      payload: { recommend: [] },
+    });
+  }
+
+  handleRecommendPageSubmit = () => {
+    const { dispatch, merchantDetail } = this.props;
+    const { filters, currentItem, recommend } = merchantDetail;
+    const { id } = currentItem;
+    const idList = recommend.map(item => item.id);
+    dispatch({
+      type: 'merchantDetail/updateMerchantRecommend',
+      payload: { merchantId: id, idList },
+      callback: () => {
+        dispatch(
+          routerRedux.push({
+            pathname: '/merchant',
+            search: queryString.stringify(filters)
+          })
+        );
+      },
+    });
+  }
 
-    const tabList = [{
-      key: 'baseInfo',
-      tab: '基础信息',
-    },{
-      key: 'recommend',
-      tab: '推荐位设置',
-    }];
+  render() {
+    const { dispatch, merchantDetail, mproduct } = this.props;
+    const {
+      itemLoading,
+      currentItem,
+      filters,
+      operType,
+      recommend,
+      recModalShow,
+      recLoading,
+    } = merchantDetail;
+
+    const { domain } = currentItem;
 
-    const baseInfoCardProps = {
+    let tabList;
+    if (operType === 'update' && domain === Codes.CODE_PJ) {
+      tabList = [{
+        key: 'baseInfo',
+        tab: '基础信息',
+      },{
+        key: 'recommend',
+        tab: '推荐位设置',
+      }];
+    }
+
+    const baseInfoTabProps = {
       item: currentItem,
+      loading: itemLoading,
       onCancel: () => {
         dispatch(
           routerRedux.push({
@@ -41,29 +170,61 @@ export default class MerchantDetail extends PureComponent {
             search: queryString.stringify(filters)
           })
         );
+        dispatch({
+          type: 'merchantDetail/clearCache',
+          payload: { currentItem: {} },
+        });
       },
       onSubmit: (data) => {
-        console.log(data);
+        const newData = { ...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,
+          callback: () => {
+            dispatch(routerRedux.push({
+              pathname: '/merchant',
+              search: queryString.stringify(filters),
+            }));
+          }
+        });
       }
     };
-    const recommendCardProps = {
-
+    const recommendTabProps = {
+      rowKeyName: "id",
+      loading: recLoading,
+      selTableData: recommend,
+      modalVisible: recModalShow,
+      fsTableDataSource: mproduct.list,
+      fsTablePagination: mproduct.pagination,
+      fsTableLoading: mproduct.listLoading,
+      fsTableOnChange: this.handleRecommendModalTableChange,
+      onOk: this.handleRecommendModalOk,
+      onCancel: this.handleRecommendModalCancel,
+      onSearch: this.handleRecommendModalSearch,
+      modalShowController: this.handleRecommendAdjustClick,
+      onPageCancel: this.handleRecommendPageCancel,
+      onPageSubmit: this.handleRecommendPageSubmit,
     };
 
     const contentMap = {
-      baseInfo: <BaseInfoCard { ...baseInfoCardProps }/>,
-      recommend: <RecommendList />
+      baseInfo: <BaseInfoCard { ...baseInfoTabProps }/>,
+      recommend: <RecommendList { ...recommendTabProps } />
     };
 
     return (
       <PageHeaderLayout
-        title="相关配置"
         tabList={tabList}
         onTabChange={this.handleTabChange}
       >
-        <Spin spinning={itemLoading}>
-          {contentMap[this.state.curTab]}
-        </Spin>
+        {contentMap[this.state.curTab]}
       </PageHeaderLayout>
     );
   }

src/routes/Merchant/Edit/recommend.js

@@ -1,12 +1,138 @@
 import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
-import { Card } from 'antd';
+import { Card, Spin, Table, Button } from 'antd';
+import SelectModal from '../../../components/SelectModal';
+import styles from './recommend.less';
+import { productType } from '../../../utils/config';
 
 export default class RecommendList extends PureComponent {
+
   render() {
+    const {
+      loading,
+      modalVisible,
+      modalShowController,
+      rowKeyName,
+      selTableData,
+      recModalShow,
+      onCancel,
+      onOk,
+      onSearch,
+      onPageCancel,
+      onPageSubmit,
+      ...fsTableOpts
+    } = this.props;
+
+    const modalProps = {
+      title: '选择产品',
+      maskClosable: false,
+      visible: modalVisible,
+      onCancel,
+      onOk,
+    };
+
+    const searchProps = {
+      searchField: 'name',
+      searchKeyWord: '',
+      searchSize: 'default',
+      searchSelect: true,
+      searchSelectOptions: [{
+        value: 'name', name: '产品名称', mode: 'input',
+      },{
+        value: 'code', name: '产品编号', mode: 'input',
+      }],
+      searchSelectProps: {
+        defaultValue: 'name',
+      },
+      onSearch: (value) => {
+        onSearch(value);
+      },
+    };
+
+    const selTableProps = {
+      operSort: true,
+      operDel: true,
+      tableClassName: styles.sTable,
+      tablePagination: false,
+      tableDataSource: selTableData,
+      rowKeyName: rowKeyName,
+      tableColumns: [{
+        title: '产品编号',
+        dataIndex: 'code',
+        key: 'code',
+      },{
+        title: '产品名称',
+        dataIndex: 'name',
+        key: 'name',
+      },{
+        title: '类型',
+        dataIndex: 'type',
+        key: 'type',
+        render: (text, record) => productType[text],
+      }]
+    };
+
+    const fsTableProps = {
+      fsTableClassName: styles.fsTable,
+      fsTableColumns: [{
+        title: '产品编号',
+        dataIndex: 'code',
+        key: 'code',
+      },{
+        title: '产品名称',
+        dataIndex: 'name',
+        key: 'name',
+      },{
+        title: '类型',
+        dataIndex: 'type',
+        key: 'type',
+        render: (text, record) => productType[text],
+      }],
+      ...fsTableOpts,
+    }
+
+    const columns = [{
+      title: '产品编号',
+      dataIndex: 'code',
+      key: 'code',
+    },{
+      title: '产品名称',
+      dataIndex: 'name',
+      key: 'name',
+    },{
+      title: '类型',
+      dataIndex: 'type',
+      key: 'type',
+      render: (text, record) => productType[text],
+    },{
+      title: '位置',
+      dataIndex: 'sort',
+      key: 'sort',
+      render: (text, record, index) => index + 1,
+    }];
+
     return (
-      <Card title="推荐位配置">
-      </Card>
+      <Spin spinning={loading}>
+        <Card title={<Button onClick={modalShowController} type="primary" size="small" icon="edit">调整</Button>}>
+          <Table
+            bordered
+            columns={columns}
+            dataSource={selTableData}
+            rowKey={record => record.id}
+            pagination={false}
+          />
+          <Button onClick={onPageCancel} style={{ marginTop: 20 }}>退出</Button>
+          <Button onClick={onPageSubmit} type="primary" style={{ marginLeft: 50, marginTop: 20 }}>保存</Button>
+        </Card>
+        {/*渠道产品选择模态框*/}
+        <SelectModal
+          mode="multiple"
+          {...modalProps}
+          {...searchProps}
+          {...selTableProps}
+          {...fsTableProps}
+        />
+      </Spin>
     );
   }
 }

src/routes/Merchant/Edit/recommend.less

@@ -0,0 +1,128 @@
+.fsTable {
+  :global {
+    .ant-table-tbody > tr > td,
+    .ant-table-thead > tr > th {
+      height: 50px;
+    }
+  }
+
+  :global {
+    .ant-table-tbody > tr > td,
+    .ant-table-thead > tr > th {
+      &:nth-child(1) {
+        width: 30%;
+      }
+
+      &:nth-child(2) {
+        width: 30%;
+      }
+
+      &:nth-child(3) {
+        width: 20%;
+      }
+
+      &:nth-child(4) {
+        width: 20%;
+      }
+    }
+
+    .ant-table-thead {
+      & > tr {
+        transition: none;
+        display: block;
+
+        & > th {
+          display: inline-flex;
+          align-items: center;
+          justify-content: center;
+        }
+      }
+    }
+
+    .ant-table-tbody {
+      & > tr {
+        transition: none;
+        display: block;
+        border-bottom: 1px solid #f5f5f5;
+
+        & > td {
+          border-bottom: none;
+          display: inline-flex;
+          align-items: center;
+          justify-content: center;
+        }
+
+        &.ant-table-expanded-row-level-1 > td {
+          height: auto;
+        }
+      }
+    }
+  }
+}
+
+
+.sTable {
+  :global {
+    .ant-table-tbody > tr > td,
+    .ant-table-thead > tr > th {
+      height: 50px;
+    }
+  }
+
+  :global {
+    .ant-table-tbody > tr > td,
+    .ant-table-thead > tr > th {
+      &:nth-child(1) {
+        width: 25%;
+      }
+
+      &:nth-child(2) {
+        width: 25%;
+      }
+
+      &:nth-child(3) {
+        width: 14%;
+      }
+
+      &:nth-child(4) {
+        width: 22%;
+      }
+
+      &:nth-child(5) {
+        width: 14%;
+      }
+    }
+
+    .ant-table-thead {
+      & > tr {
+        transition: none;
+        display: block;
+
+        & > th {
+          display: inline-flex;
+          align-items: center;
+          justify-content: center;
+        }
+      }
+    }
+
+    .ant-table-tbody {
+      & > tr {
+        transition: none;
+        display: block;
+        border-bottom: 1px solid #f5f5f5;
+
+        & > td {
+          border-bottom: none;
+          display: inline-flex;
+          align-items: center;
+          justify-content: center;
+        }
+
+        &.ant-table-expanded-row-level-1 > td {
+          height: auto;
+        }
+      }
+    }
+  }
+}

src/routes/Merchant/List/table.js

@@ -48,7 +48,7 @@ export default class TableList extends PureComponent {
       dataIndex: 'domain',
       key: 'domain',
       render: (text, record) => (
-        <div>{domains[record.domain] || '未定义'}</div>
+        <div>{domains[record.domain]}</div>
       ),
       filters: Object.keys(domains).map(key => ({ text: domains[key], value: key })),
       filterMultiple: false,
@@ -58,18 +58,18 @@ export default class TableList extends PureComponent {
       dataIndex: 'status',
       key: 'status',
       render: (text, record) => {
-        const statusMap = {'NORMAL': 'success', 'DEL': 'error'};
+        const statusMap = {[Codes.CODE_NORMAL]: 'success', [Codes.CODE_DELETE]: 'error'};
         return (<Badge status={statusMap[record.status]} text={statuses[record.status]} />);
       },
       filters: Object.keys(statuses).map(key => ({ text: statuses[key], value: key })),
       filterMultiple: false,
       filteredValue: [curStatus],
     },{
-      title: '添加时间',
-      dataIndex: 'gmtCreated',
-      key: 'gmtCreated',
+      title: '修改时间',
+      dataIndex: 'gmtModified',
+      key: 'gmtModified',
       render: (text, record) => (
-        <div>{moment(text).format('YYYY-MM-DD')}</div>
+        <div>{moment(text).format('YYYY-MM-DD HH:mm:ss')}</div>
       )
     },{
       title: '操作',

src/routes/Terminal/modal.js

@@ -49,17 +49,17 @@ const ModalForm = ({
         <FormItem label="终端编号：" hasFeedback {...formItemLayout}>
           {getFieldDecorator('code', {
             initialValue: item.code,
-          })(<Input disabled={true} placeholder="不填写，根据校区自动生成"/>)}
+          })(<Input disabled={true} placeholder="请输入"/>)}
         </FormItem>
         <FormItem label="终端名称：" hasFeedback {...formItemLayout}>
           {getFieldDecorator('name', {
             initialValue: item.name,
-          })(<Input placeholder="可选项，为空自动创建教室名"/>)}
+          })(<Input placeholder="请输入"/>)}
         </FormItem>
         <FormItem label="终端密码：" hasFeedback {...formItemLayout}>
           {getFieldDecorator('password', {
             initialValue: item.password,
-          })(<Input placeholder="修改密码时使用，请谨慎填写！" type="password" addonBefore={<Icon type="edit" />}/>)}
+          })(<Input placeholder="请输入" type="password" addonBefore={<Icon type="edit" />}/>)}
         </FormItem>
         <FormItem label="账号状态：" {...formItemLayout}>
           {getFieldDecorator('status', {

src/services/combo.js

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

src/services/merchant.js

@@ -1,13 +1,13 @@
 import { stringify } from 'qs';
 import request from '../utils/request';
-import { merchants, merchant } from '../utils/api';
+import { merchants, merchant, recommend } from '../utils/api';
 
 export async function query(params) {
   return request(`${merchants}?${stringify(params)}`);
 }
 
 export async function queryOne({ id }) {
-  return request(`${merchant.replace('/:id', `/${id}`)}`);
+  return request(`${merchant}/${id}`);
 }
 
 export async function create(params) {
@@ -15,7 +15,7 @@ export async function create(params) {
     method: 'POST',
     body: JSON.stringify(params),
   };
-  return request(`${merchant.replace('/:id', '')}`, options);
+  return request(`${merchant}`, options);
 }
 
 export async function update(params) {
@@ -23,10 +23,22 @@ export async function update(params) {
     method: 'PUT',
     body: JSON.stringify(params),
   };
-  return request(`${merchant.replace('/:id', '')}`, options);
+  return request(`${merchant}`, options);
 }
 
 export async function remove({ id }) {
   const options = { method: 'DELETE' }
-  return request(`${merchant.replace('/:id', `/${id}`)}`, options);
+  return request(`${merchant}/${id}`, options);
+}
+
+export async function queryMerchantRecommend({ id }) {
+  return request(`${recommend}/${id}`);
+}
+
+export async function updateMerchantRecommend({ merchantId, idList }) {
+  const options = {
+    method: 'PUT',
+    body: JSON.stringify(idList),
+  };
+  return request(`${recommend}/${merchantId}`, options);
 }

src/services/order.js

@@ -1,9 +1,9 @@
 import { stringify } from 'qs';
 import request from '../utils/request';
-import { orders, order } from '../utils/api';
+import { order } from '../utils/api';
 
 export async function query(params) {
-  return request(`${orders}?${stringify(params)}`);
+  return request(`${order}?${stringify(params)}`);
 }
 
 export async function queryOne({ id }) {

src/services/product.js

@@ -1,6 +1,6 @@
 import { stringify } from 'qs';
 import request from '../utils/request';
-import { product } from '../utils/api';
+import { product, savePackage } from '../utils/api';
 
 /**
  * @desc 获取全部产品 /product
@@ -47,3 +47,25 @@ 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/utils/api.js

@@ -13,7 +13,8 @@ module.exports = {
   terminals: `${config.apiHost}/user/list`,
   terminal: `${config.apiHost}/user/:id`,
   merchants: `${config.apiHost}/merchant/list`,
-  merchant: `${config.apiHost}/merchant/:id`,
+  merchant: `${config.apiHost}/merchant`,
+  recommend: `${config.apiHost}/merchant/recommend`,
   // 标签组及标签
   groups: `${config.apiHost}/group/list`,
   group: `${config.apiHost}/group`,
@@ -28,7 +29,8 @@ module.exports = {
   product: `${config.apiHost}/product`,
   course: `${config.apiHost}/product/course`,
   support: `${config.apiHost}/product/support`,
-  combo: `${config.apiHost}/product/package`,
+  packageList: `${config.apiHost}/product/package`,
+  savePackage: `${config.apiHost}/package`,
   // 渠道产品接口
   merchantProducts: `${config.apiHost}/merchant/product`,
   merchantProduct: `${config.apiHost}/merchant/product/detail`,
@@ -37,8 +39,7 @@ module.exports = {
   // 商品接口
   goods: `${config.apiHost}/goods`,
   // 订单接口
-  orders: `${config.apiHost}/orders`,
-  order: `${config.apiHost}/order/:id`,
+  order: `${config.apiHost}/order`,
   // 销售统计
   soldProduct: `${config.apiHost}/soldProduct`,
 };

src/utils/config.js

@@ -29,7 +29,7 @@ Codes.CODE_SEASON = '季';
 Codes.CODE_ITEM = '件';
 
 module.exports = {
-  apiHost: 'http://lj.dev.cms.api.com:8100',
+  apiHost: 'http://lj.dev.cms.api.com:8500',
   // apiHost: '/api',
   // 每页返回数据量
   pageSize: 10,
@@ -58,7 +58,6 @@ module.exports = {
   },
   // 平台代号
   domains: {
-    [Codes.CODE_LJ]: '领教方',
     [Codes.CODE_CP]: '供应商',
     [Codes.CODE_PJ]: '渠道商',
   },