:twisted_rightwards_arrows: fix conflict

src/routes/Frontend/ConfigUser/ConfigRecommendCourse.js

@@ -1,156 +0,0 @@
-import React, { Component } from 'react';
-import pathToRegexp from 'path-to-regexp';
-import { connect } from 'dva';
-import { routerRedux } from 'dva/router';
-import { Card, Modal, Button } from 'antd';
-import AXDragSortTable from '../../../components/AXDragSortTable';
-import Selector from '../../../components/AXTableSelector/Selector';
-import FooterToolbar from '../../../components/FooterToolbar/index';
-
-@connect(({ loading, merchant, shelves, configUser }) => ({
-  shelves,
-  merchant,
-  configUser,
-  sLoading: loading.models.product,
-  submitting: loading.models.merchant,
-}))
-
-export default class ConfigCourse extends Component {
-  state = {
-    productSelectorDestroy: true,
-  };
-  componentDidMount() {
-    this.props.dispatch({
-      type: 'configUser/fetchConfigCourse',
-      payload: { courseId: this.getMerchantId() },
-    });
-  }
-  getMerchantId = () => {
-    const match = pathToRegexp('/frontend/ConfigUser/course-edit/:id')
-      .exec(this.props.location.pathname);
-    return match[1];
-  }
-  handleSelectorModalShow = () => {
-    const { itemData } = this.props.location.state;
-    const { merchantId: id } = itemData;
-    this.setState({ productSelectorDestroy: false });
-    this.props.dispatch({
-      type: 'shelves/fetchCourseItemList',
-      payload: { merchantId: id },
-    });
-  }
-  handleSelectorChange = (params) => {
-    const { itemData } = this.props.location.state;
-    const { merchantId: id } = itemData;
-    this.props.dispatch({
-      type: 'shelves/fetchCourseItemList',
-      payload: {
-        merchantId: id,
-        ...params,
-      },
-    });
-  }
-  handleSelectorFinish = (rows) => {
-    this.setState({ productSelectorDestroy: true });
-    this.props.dispatch({
-      type: 'configUser/fixCourseList',
-      payload: rows,
-    });
-  }
-  handleSelectorCancel = () => {
-    this.setState({ productSelectorDestroy: true });
-  }
-  handleDragSortTableChange = (rows) => {
-    this.props.dispatch({
-      type: 'configUser/fixCourseList',
-      payload: rows,
-    });
-  }
-  handlePageBack = () => {
-    this.props.dispatch(routerRedux.push({
-      pathname: '/frontend/ConfigUser',
-      state: this.props.location.state,
-    }));
-  }
-  handlePageSubmit = () => {
-    const { configUser } = this.props;
-    const { courseList } = configUser;
-    const idList = courseList.map(item => item.pid);
-    this.props.dispatch({
-      type: 'configUser/updateConfigCourse',
-      payload: {
-        idList,
-        courseId: this.getMerchantId(),
-      },
-    });
-  }
-
-  render() {
-    const { productSelectorDestroy } = this.state;
-    const { shelves, configUser } = this.props;
-    const { courseList } = configUser;
-    // recommend事件
-    const productColumns = [{
-      title: '课程编号',
-      key: 1,
-      dataIndex: 'code',
-      width: '40%',
-    }, {
-      title: '课程名称',
-      key: 2,
-      dataIndex: 'name',
-    }];
-    const getProductModal = () => {
-      return (
-        <Modal
-          visible
-          width={1100}
-          footer={null}
-          title="课程资源"
-          maskClosable={false}
-          onCancel={this.handleSelectorCancel}
-        >
-          <Selector
-            multiple
-            selectorName="Course"
-            selectedRows={courseList}
-            list={shelves.list}
-            pageNo={shelves.pageNo}
-            pageSize={shelves.pageSize}
-            totalSize={shelves.totalSize}
-            onCancel={this.handleSelectorCancel}
-            onChange={this.handleSelectorChange}
-            onFinish={this.handleSelectorFinish}
-          />
-        </Modal>
-      );
-    };
-    return (
-      <div>
-        <Card
-          title={<a onClick={this.handleSelectorModalShow}>选择课程</a>}
-          style={{ marginBottom: 70 }}
-        >
-          <AXDragSortTable
-            columns={productColumns}
-            data={courseList}
-            onChange={this.handleDragSortTableChange}
-          />
-          {!productSelectorDestroy && getProductModal()}
-        </Card>
-        <FooterToolbar style={{ width: '100%' }}>
-          <Button
-            onClick={this.handlePageBack}
-            style={{ marginRight: 10 }}
-          >取消
-          </Button>
-          <Button
-            type="primary"
-            onClick={this.handlePageSubmit}
-          >提交
-          </Button>
-        </FooterToolbar>
-      </div>
-    );
-  }
-}

src/routes/Frontend/ConfigUser/ConfigRecommendPoster.js

@@ -1,11 +0,0 @@
-import React, { Component } from 'react';
-
-export default class ConfigPoster extends Component {
-  render() {
-    return (
-      <div>
-        <h2>用户终端海报接口暂未开放</h2>
-      </div>
-    );
-  }
-}

src/routes/Frontend/ConfigUser/ConfigTag.js

@@ -1,564 +0,0 @@
-import React, { Component } from 'react';
-import pathToRegexp from 'path-to-regexp';
-import { connect } from 'dva';
-import { routerRedux } from 'dva/router';
-import { Card, Table, Modal, Popconfirm, Switch, Button, Input, Icon } from 'antd';
-import Selector from '../../../components/AXTableSelector/Selector';
-import FooterToolbar from '../../../components/FooterToolbar';
-import { boolToStatus, renderStatus, statusToBool } from '../../../utils/utils';
-import styles from './ConfigTag.less';
-
-@connect(({ loading, merchant, shelves, resource, configUser, tagType, tag }) => ({
-  shelves,
-  merchant,
-  resource,
-  configUser,
-  tagType,
-  tag,
-  loading: loading.models.tagType,
-  rLoading: loading.models.resource,
-  sLoading: loading.models.shelves,
-  mLoading: loading.models.merchant,
-}))
-export default class ConfigTag extends Component {
-  state = {
-    productSelectorDestroy: true,
-    resourceSelectorDestroy: true,
-    allTagSelectorDestroy: true,
-    productType: 'Course',
-    currentEditTagId: '',
-  };
-  componentDidMount() {
-    this.props.dispatch({
-      type: 'configUser/fetchUserTags',
-      payload: { configUserId: this.getConfigUserId() },
-    });
-    this.props.dispatch({
-      type: 'tagType/fetchTagTypeList',
-      payload: {},
-    });
-    this.props.dispatch({
-      type: 'tagType/fetchMerchantPoster',
-      payload: { merchantId: this.getConfigUserId() },
-    });
-  }
-  /**
-   * 1.从URL中提取configUserId
-   * @returns {String}
-   */
-  getConfigUserId = () => {
-    const match = pathToRegexp('/frontend/ConfigUser/tag/:id')
-      .exec(this.props.location.pathname);
-    return match[1];
-  };
-  /**
-   * 2.终端用户新建标签
-   */
-  handleTagItemCreate = () => {
-    const newData = [...this.props.configUser.userTagLists];
-    newData.push({
-      id: `new-poster-${newData.length + 1}`,
-      isNew: true,
-      isEdit: true,
-    });
-    this.props.dispatch({
-      type: 'configUser/fixUserTagLists',
-      payload: newData,
-    });
-  };
-  /**
-   * 3.删除一跳标签信息
-   * @param TagId
-   * @param isNew
-   */
-  handleTagItemDelete = (TagId, isNew) => {
-    if (isNew) {
-      const originalData = [...this.props.configUser.userTagLists];
-      const newData = originalData.filter(data => data.id !== TagId);
-      this.props.dispatch({
-        type: 'configUser/fixUserTagLists',
-        payload: newData,
-      });
-      return;
-    }
-    this.props.dispatch({
-      type: 'configUser/deleteConfigUserTagItem',
-      payload: TagId,
-    });
-  }
-  /**
-   * 4.编辑一条标签
-   * @param TagId
-   */
-  handleTagItemEdit = (TagId) => {
-    const newData = [...this.props.configUser.userTagLists];
-    for (const index in newData) {
-      if (newData[index].id === TagId) {
-        newData[index].isEdit = true;
-      }
-    }
-    this.props.dispatch({
-      type: 'configUser/fixUserTagLists',
-      payload: newData,
-    });
-  };
-  /**
-   * 5.根据flag,控制模态框的展现
-   * @param flag
-   * @param TagId
-   */
-  handleSelectorModalShow = (flag, TagId) => {
-    this.setState({
-      [`${flag}SelectorDestroy`]: false,
-      currentEditTagId: TagId,
-    });
-    if (flag === 'product') {
-      this.props.dispatch({
-        type: 'configUser/fetchTagDetail',
-        payload: TagId,
-      });
-      return;
-    }
-    if (flag === 'resource') {
-      this.props.dispatch({
-        type: 'tagType/fetchTagTypeList',
-        payload: {},
-      });
-    }
-    if (flag === 'allTag') {
-      this.props.dispatch({
-        type: 'tag/fetchTagList',
-      });
-    }
-  };
-  /**
-   * 6.控制模态框的销毁
-   */
-  handleSelectorCancel = (flag) => {
-    this.setState({ [`${flag}SelectorDestroy`]: true });
-  };
-  /**
-   * 7.模态框内的查询操作 完成
-   * @param {String} flag
-   * @param {Object} params
-   */
-  handleSelectorChange = (flag, params) => {
-    if (flag === 'product') {
-      const { productType } = this.state;
-      this.props.dispatch({
-        type: `shelves/fetch${productType}ItemList`,
-        payload: { ...params, merchantId: this.getConfigUserId() },
-      });
-      return;
-    }
-    if (flag === 'allTag') {
-      this.props.dispatch({
-        type: 'tag/fetchTagList',
-        payload: params,
-      });
-    }
-    if (flag === 'resource') {
-      this.props.dispatch({
-        type: 'tagType/fetchTagTypeList',
-        payload: params,
-      });
-    }
-  };
-  /**
-   * 8.响应选择完成操作 数据的回显 模态框的处理
-   * @param {String} flag
-   * @param {Array} rows
-   */
-  handleSelectorFinish = (flag, rows) => {
-    this.setState({ [`${flag}SelectorDestroy`]: true });
-    const { currentEditTagId } = this.state;
-    const originalData = [...this.props.configUser.userTagLists];
-    if (flag !== 'allTag') {
-      const newData = originalData.map((data) => {
-        if (flag === 'resource' && data.id === currentEditTagId) {
-          return { ...data, typeCode: rows[0].code };
-        }
-        return { ...data };
-      });
-      this.props.dispatch({
-        type: 'configUser/fixUserTagLists',
-        payload: newData,
-      });
-    } else {
-      this.props.dispatch({
-        type: 'configUser/copyTag',
-        payload: {
-          userTagId: currentEditTagId,
-          tagId: rows[0].id,
-        },
-      });
-    }
-  };
-  /**
-   * 9.修改排序值
-   * @param e
-   * @param TagId
-   */
-  handleSortInputChange = (e, TagId) => {
-    const originalData = [...this.props.configUser.userTagLists];
-    const newData = originalData.map((data) => {
-      if (data.id === TagId) {
-        return { ...data, sort: parseInt(e.target.value, 10) || 0 };
-      }
-      return { ...data };
-    });
-    this.props.dispatch({
-      type: 'configUser/fixUserTagLists',
-      payload: newData,
-    });
-  };
-  /**
-   * 10.修改标签名称
-   * @param e
-   * @param TagId
-   */
-  handleNameInputChange = (e, TagId) => {
-    const originalData = [...this.props.configUser.userTagLists];
-    const newData = originalData.map((data) => {
-      if (data.id === TagId) {
-        return { ...data, name: e.target.value };
-      }
-      return { ...data };
-    });
-    this.props.dispatch({
-      type: 'configUser/fixUserTagLists',
-      payload: newData,
-    });
-  };
-  /**
-   * 11.修改状态
-   * @param checked
-   * @param TagId
-   */
-  handleStatusSwitchChange = (checked, TagId) => {
-    const originalData = [...this.props.configUser.userTagLists];
-    const newData = originalData.map((data) => {
-      if (data.id === TagId) {
-        return { ...data, status: boolToStatus(checked) };
-      }
-      return { ...data };
-    });
-    this.props.dispatch({
-      type: 'configUser/fixUserTagLists',
-      payload: newData,
-    });
-  };
-  /**
-   * 12.提交标签的内容
-   * @param TagId
-   */
-  handleSaveOperation = (TagId) => {
-    const originalData = [...this.props.configUser.userTagLists];
-    const targetData = originalData.filter(data => data.id === TagId)[0];
-    const { id, sort, name, typeCode, status, isNew } = targetData;
-    if (isNew) {
-      this.props.dispatch({
-        type: 'configUser/createConfigUserTagItem',
-        payload: {
-          name, typeCode, sort, status: boolToStatus(status), uid: this.getConfigUserId(),
-        },
-        TagId: id,
-      });
-      return;
-    }
-    this.props.dispatch({
-      type: 'configUser/updateConfigUserTagItem',
-      payload: {
-        id, name, typeCode, sort, status: boolToStatus(status), uid: this.getConfigUserId(),
-      },
-      TagId: id,
-    });
-  };
-  /**
-   * 13.返回上一页 finished
-   */
-  handlePageBack = () => {
-    this.props.dispatch(routerRedux.push({
-      pathname: '/frontend/ConfigUser/list',
-      state: this.props.location.state,
-    }));
-  };
-  render() {
-    const { productSelectorDestroy, resourceSelectorDestroy, allTagSelectorDestroy } = this.state;
-    const { configUser, tagType, tag, loading } = this.props;
-    const { userTagLists } = configUser;
-    /* 海报列表格式设定 */
-    const userTagColumns = [{
-      title: '位置',
-      key: 1,
-      dataIndex: 'sort',
-      width: '10%',
-      render: (text, record) => {
-        const { id, isEdit } = record;
-        if (isEdit) {
-          return (
-            <Input
-              value={text}
-              onChange={e => this.handleSortInputChange(e, id)}
-              placeholder="必填项"
-              style={{ width: 100 }}
-            />
-          );
-        }
-        return text;
-      },
-      align: 'center',
-    }, {
-      title: '标签名称',
-      key: 2,
-      dataIndex: 'name',
-      width: '15%',
-      render: (text, record) => {
-        const { id, isEdit } = record;
-        if (isEdit) {
-          return (
-            <Input
-              value={text}
-              onChange={e => this.handleNameInputChange(e, id)}
-              placeholder="必填项"
-              style={{ width: 100 }}
-            />
-          );
-        }
-        return text;
-      },
-      align: 'center',
-    }, {
-      title: '标签类型',
-      key: 3,
-      dataIndex: 'typeCode',
-      width: '15%',
-      render: (text, record) => {
-        // 将标签类型更换，编辑状态下可更换
-        const { id, isNew, isEdit, typeCode = '标签类型选择(必选项)' } = record;
-        return (
-          <div className={styles.product}>
-            {isEdit && (
-              <div className={styles.mongolian}>
-                <a onClick={() => this.handleSelectorModalShow('resource', id)}>{isNew ? '选择' : '更换'}</a>
-              </div>
-            )}
-            {typeCode}
-          </div>
-        );
-      },
-      align: 'center',
-    }, {
-      title: '标签状态',
-      key: 4,
-      dataIndex: 'status',
-      width: '15%',
-      render: (text, record) => {
-        const { id, isEdit } = record;
-        if (isEdit) {
-          return (
-            <Switch
-              checked={statusToBool(text)}
-              checkedChildren="正常"
-              unCheckedChildren="删除"
-              onChange={checked => this.handleStatusSwitchChange(checked, id)}
-            />
-          );
-        }
-        return renderStatus(text);
-      },
-      align: 'center',
-    }, {
-      title: '标签关联产品',
-      key: 5,
-      render: (_, record) => {
-        const { id, isEdit } = record;
-        if (isEdit) {
-          return (
-            <div>
-              <p>此处暂时无法编辑，只做查看</p>
-            </div>
-          );
-        }
-        return (
-          <div>
-            <a onClick={() => this.handleSelectorModalShow('product', id)}>
-              <Icon type="double-right" />查看详情
-            </a>
-          </div>
-        );
-      },
-      width: '20%',
-      align: 'center',
-    }, {
-      title: '操作',
-      key: 6,
-      width: '30%',
-      render: (_, record) => {
-        const { id, isNew, isEdit } = record;
-        const getPopconfirmBtn = () => {
-          return (
-            <Popconfirm
-              placement="top"
-              title="确定要删除该标签？"
-              okText="确定"
-              cancelText="取消"
-              onConfirm={() => this.handleTagItemDelete(id, isNew)}
-            >
-              <Button
-                size="small"
-                className="delBtn"
-              >删除
-              </Button>
-            </Popconfirm>
-          );
-        };
-        if (isEdit) {
-          return (
-            <div>
-              <Button
-                size="small"
-                className="editBtn"
-                onClick={() => this.handleSaveOperation(id)}
-              >保存
-              </Button>
-              {getPopconfirmBtn()}
-              <Button
-                size="small"
-                className="depositBtn"
-                onClick={() => this.handleSelectorModalShow('allTag', id)}
-              >复制
-              </Button>
-            </div>
-          );
-        }
-        return (
-          <div>
-            <Button
-              size="small"
-              className="editBtn"
-              onClick={() => this.handleTagItemEdit(id)}
-            >编辑
-            </Button>
-            {getPopconfirmBtn()}
-            <Button
-              size="small"
-              className="depositBtn"
-              onClick={() => this.handleSelectorModalShow('allTag', id)}
-            >复制
-            </Button>
-          </div>
-        );
-      },
-      align: 'right',
-    }];
-    const getProductModal = () => {
-      const columns = [
-        {
-          title: '产品编号',
-          dataIndex: 'code',
-        },
-        {
-          title: '产品名称',
-          dataIndex: 'name',
-        },
-      ];
-      const { productList = [] } = this.props.configUser.TagDetails;
-      return (
-        <Modal
-          visible
-          width={1100}
-          title="关联产品详情"
-          footer={null}
-          maskClosable={false}
-          onCancel={() => this.handleSelectorCancel('product')}
-        >
-          <Table
-            columns={columns}
-            dataSource={productList}
-            fixedName="Product"
-            onCancel={() => this.handleSelectorCancel('product')}
-          />
-        </Modal>
-      );
-    };
-    /* 标签模态框选择器 */
-    const getResourceModal = () => {
-      return (
-        <Modal
-          width={1100}
-          footer={null}
-          visible
-          title="标签类型"
-          maskClosable={false}
-          onCancel={() => this.handleSelectorCancel('resource')}
-        >
-          <Selector
-            multiple={false}
-            loading={loading}
-            selectorName="TagType"
-            list={tagType.list}
-            pageNo={tagType.pageNo}
-            pageSize={tagType.pageSize}
-            totalSize={tagType.totalSize}
-            onCancel={() => this.handleSelectorCancel('resource')}
-            onChange={data => this.handleSelectorChange('resource', data)}
-            onFinish={rows => this.handleSelectorFinish('resource', rows)}
-          />
-        </Modal>
-      );
-    };
-    /* 选择标签的对应的模态框 */
-    const getAllTagModal = () => {
-      return (
-        <Modal
-          width={1100}
-          footer={null}
-          visible
-          title="可选择的标签"
-          maskClosable={false}
-          onCancel={() => this.handleSelectorCancel('allTag')}
-        >
-          <Selector
-            multiple={false}
-            loading={loading}
-            selectorName="allTag"
-            list={tag.list}
-            pageNo={tag.pageNo}
-            pageSize={tag.pageSize}
-            totalSize={tag.totalSize}
-            onCancel={() => this.handleSelectorCancel('allTag')}
-            onChange={data => this.handleSelectorChange('allTag', data)}
-            onFinish={rows => this.handleSelectorFinish('allTag', rows)}
-          />
-        </Modal>
-      );
-    };
-    return (
-      <div>
-        <Card style={{ marginBottom: 70 }}>
-          <Table
-            pagination={false}
-            dataSource={userTagLists}
-            columns={userTagColumns}
-            rowKey={record => record.id}
-            className={styles.posterTable}
-          />
-          <Button
-            type="dashed"
-            icon="plus"
-            style={{ width: '100%', marginTop: 16, marginBottom: 8 }}
-            onClick={this.handleTagItemCreate}
-          >新建
-          </Button>
-          {!resourceSelectorDestroy && getResourceModal()}
-          {!productSelectorDestroy && getProductModal()}
-          {!allTagSelectorDestroy && getAllTagModal()}
-        </Card>
-        <FooterToolbar style={{ width: '100%' }}>
-          <Button type="primary" onClick={this.handlePageBack}>返回上一页</Button>
-        </FooterToolbar>
-      </div>
-    );
-  }
-}

src/routes/Frontend/ConfigUser/ConfigTag.less

@@ -1,67 +0,0 @@
-@import "../../../../node_modules/antd/lib/style/themes/default.less";
-
-.posterTable {
-  :global {
-    .ant-table-title {
-      padding: 0 0 16px 0;
-    }
-    .ant-table-footer {
-      padding: 10px;
-    }
-    .ant-table-tbody > tr > td {
-      padding: 5px 10px;
-    }
-    .ant-table-thead > tr > th {
-      padding: 10px 5px;
-    }
-  }
-}
-
-.mongolian {
-  z-index: 10;
-  display: none;
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  a {
-    position: relative;
-    top: 45%;
-    transform: translateY(-45%);
-    padding: 5px 15px;
-    background: #fff;
-    color: #73777a;
-  }
-}
-
-.cover {
-  position: relative;
-  margin: 0;
-  width: 100%;
-  height: 100%;
-  img {
-    width: 100%;
-    height: 100%;
-  }
-  &:hover {
-    .mongolian {
-      display: block;
-      background: rgba(0, 193, 222, .8);
-    }
-  }
-}
-
-.product {
-  position: relative;
-  &:hover {
-    .mongolian {
-      display: block;
-      background: rgba(0, 193, 222, .8);
-    }
-  }
-}
-.copyBtn {
-  margin-left: 10px;
-  font-weight: 500;
-}

src/routes/Frontend/ConfigUser/ConfigUserLists.js

@@ -1,188 +0,0 @@
-import React, { Component } from 'react';
-import { connect } from 'dva';
-import { routerRedux } from 'dva/router';
-import { Card, Form, Menu, Dropdown, Icon } from 'antd';
-import { StandardTableList } from '../../../components/AXList/index';
-import Ellipsis from '../../../components/Ellipsis/index';
-import { addRowKey, renderStatus } from '../../../utils/utils';
-
-@Form.create()
-@connect(({ loading, campus, merchant, terminal }) => ({
-  campus,
-  merchant,
-  terminal,
-  fetching1: loading.models.merchant,
-  fetching2: loading.models.campus,
-  loading: loading.models.terminal,
-}))
-
-export default class ConfigUserLists extends Component {
-  constructor(props) {
-    super(props);
-    const { state } = props.location;
-    this.state = {
-      UIParams: (state || {}).UIParams, // 组件的状态参数
-      Queryers: (state || {}).Queryers, // 查询的条件参数
-      filterModalDestroy: true,
-      itemData: {},
-    };
-  }
-  componentDidMount() {
-    this.props.dispatch({
-      type: 'terminal/fetchTerminalList',
-      payload: { ...this.state.Queryers },
-    });
-  }
-  // 跳转到配置标签的page
-  handleEditOperation = (item) => {
-    this.props.dispatch(routerRedux.push({
-      pathname: `/frontend/ConfigUser/tag/${item.id}`,
-      state: {
-        currentItem: item,
-        ...this.state,
-      },
-    }));
-  }
-  // 跳转到配置课程页面
-  handleDeviceCourseOperation = (item) => {
-    const { id } = item;
-    this.props.dispatch(routerRedux.push({
-      pathname: `/frontend/ConfigUser/course-edit/${id}`,
-      state: this.state,
-    }));
-  }
-  // 跳到配置海报的页面
-  handleDevicePosterOperation = (item) => {
-    const { id } = item;
-    this.props.dispatch(routerRedux.push({
-      pathname: `/frontend/ConfigUser/poster-edit/${id}`,
-      state: this.state,
-    }));
-  }
-  handleFilterOperation = (params, states) => {
-    this.props.dispatch({
-      type: 'terminal/fetchTerminalList',
-      payload: params,
-    });
-    this.setState({
-      UIParams: states,
-      Queryers: params,
-    });
-  }
-  // 将item中的数据传送给子栏目
-  transferData = (item) => {
-    this.setState(() => {
-      return {
-        itemData: item,
-      };
-    });
-  }
-  render() {
-    const { loading, terminal } = this.props;
-    const { list, totalSize, pageSize, pageNo } = terminal;
-    const { itemData } = this.state;
-
-    const renderCampusName = (name) => {
-      return (
-        <Ellipsis tooltip lines={1}>{name}</Ellipsis>
-      );
-    };
-    const menu = (
-      <Menu>
-        <Menu.Item>
-          <a onClick={() => this.handleDevicePosterOperation(itemData)}>
-            推荐海报
-          </a>
-        </Menu.Item>
-        <Menu.Item>
-          <a onClick={() => this.handleDeviceCourseOperation(itemData)}>
-            推荐课程
-          </a>
-        </Menu.Item>
-      </Menu>
-    );
-    const renderOperation = (item) => {
-      return (
-        <div>
-          <a
-            onClick={() => this.handleEditOperation(item)}
-          >标签配置
-          </a>
-          &nbsp;&nbsp;&nbsp;
-          <Dropdown overlay={menu} trigger={['click']}>
-            <a
-              onClick={() => this.transferData(item)}
-            >推荐配置 <Icon type="down" />
-            </a>
-          </Dropdown>
-        </div>
-      );
-    };
-    const basicSearch = {
-      keys: [{
-        name: '终端编号',
-        field: 'code',
-      }, {
-        name: '终端名称',
-        field: 'name',
-      }],
-    };
-    const pagination = {
-      pageNo,
-      pageSize,
-      totalSize,
-    };
-    const columns = [{
-      title: '终端编号',
-      key: 1,
-      dataIndex: 'code',
-      width: '20%',
-    }, {
-      title: '终端名称',
-      key: 2,
-      dataIndex: 'name',
-      width: '20%',
-    }, {
-      title: '所属校区',
-      key: 3,
-      dataIndex: 'campusName',
-      render: text => renderCampusName(text),
-      width: '22%',
-    }, {
-      title: '所属渠道',
-      key: 4,
-      dataIndex: 'merchantName',
-      width: '12%',
-    }, {
-      title: '账号状态',
-      key: 5,
-      dataIndex: 'status',
-      render: text => renderStatus(text, '已禁用'),
-      width: '8%',
-    }, {
-      title: '操作',
-      key: 6,
-      dataIndex: 'operation',
-      render: (_, record) => renderOperation(record),
-      width: '20%',
-      align: 'right',
-    }];
-    return (
-      <Card>
-        <StandardTableList
-          columns={columns}
-          loading={loading}
-          dataSource={addRowKey(list)}
-          header={{
-            basicSearch,
-            onFilterClick: this.handleFilterOperation,
-          }}
-          footer={{
-            pagination,
-          }}
-          keepUIState={{ ...this.state.UIParams }}
-        />
-      </Card>
-    );
-  }
-}

src/routes/Frontend/ConfigUser/index.js

@@ -1,32 +0,0 @@
-import React, { Component } from 'react';
-import { Redirect, Route, Switch } from 'dva/router';
-import { connect } from 'dva';
-import PageHeaderLayout from '../../../layouts/PageHeaderLayout';
-import { getRoutes } from '../../../utils/utils';
-
-@connect()
-export default class ConfigTag extends Component {
-  render() {
-    const { match, routerData } = this.props;
-    const routes = getRoutes(match.path, routerData);
-    return (
-      <PageHeaderLayout>
-        <Switch>
-          {
-            routes.map(item =>
-              (
-                <Route
-                  key={item.key}
-                  path={item.path}
-                  component={item.component}
-                  exact={item.exact}
-                />
-              )
-            )
-          }
-          <Redirect exact from="/frontend/ConfigUser" to="/frontend/ConfigUser/list" />
-        </Switch>
-      </PageHeaderLayout>
-    );
-  }
-}

src/services/configUser.js

@@ -1,104 +0,0 @@
-import { stringify } from 'qs';
-import request from '../utils/request';
-import { api } from '../utils/config';
-
-export async function queryUserTags(params) {
-  const id = params.configUserId;
-  return request(`${api.configUser}/${id}`);
-}
-
-export async function createConfigUserTagItem(params) {
-  const options = {
-    method: 'POST',
-    body: params,
-  };
-  return request(`${api.configUserTag}`, options);
-}
-
-
-export async function queryTagDetail(id) {
-  return request(`${api.configUserTag}/${id}`);
-}
-
-export async function updateConfigUserTagItem(params) {
-  const options = {
-    method: 'PUT',
-    body: params,
-  };
-  return request(`${api.configUserTag}`, options);
-}
-
-export async function deleteConfigUserTagItem(id) {
-  const options = {
-    method: 'DELETE',
-  };
-  return request(`${api.configUserTag}/${id}`, options);
-}
-
-export async function depositMerchantItem(params) {
-  const options = {
-    method: 'POST',
-    body: params,
-  };
-  return request(`${api.deposit}`, options);
-}
-
-export async function queryMerchantRecommend({ merchantId }) {
-  return request(`${api.recommend}/${merchantId}`);
-}
-
-export async function updateMerchantRecommend({ merchantId, idList }) {
-  const options = {
-    method: 'PUT',
-    body: idList,
-  };
-  return request(`${api.recommend}/${merchantId}`, options);
-}
-
-export async function queryMerchantPoster({ merchantId }) {
-  return request(`${api.poster}/${merchantId}`);
-}
-
-export async function queryMerchantPosterItem({ posterId }) {
-  return request(`${api.posterItem}/${posterId}`);
-}
-
-export async function createMerchantPosterItem(params) {
-  const options = {
-    method: 'POST',
-    body: params,
-  };
-  return request(`${api.posterItem}`, options);
-}
-
-export async function updateMerchantPosterItem(params) {
-  const options = {
-    method: 'PUT',
-    body: params,
-  };
-  return request(`${api.posterItem}`, options);
-}
-
-export async function deleteMerchantPosterItem({ posterId }) {
-  const options = {
-    method: 'DELETE',
-  };
-  return request(`${api.posterItem}/${posterId}`, options);
-}
-
-export async function queryConfigCourse(params) {
-  const id = params.courseId;
-  return request(`${api.configCourse}/${id}`);
-}
-
-export async function copyTag(params) {
-  return request(`${api.copyTag}?${stringify(params)}`);
-}
-
-export async function updateConfigCourse({ courseId, idList }) {
-  const options = {
-    method: 'PUT',
-    body: idList,
-  };
-  return request(`${api.configCourse}/${courseId}`, options);
-}