修改渠道管理平台

src/common/menu.js

@@ -18,62 +18,20 @@ const menuData = () => {
     }],
     authority: ['admin', 'platform'],
   }, {
-    name: '基础资源',
-    icon: 'folder',
-    path: 'resource',
-    children: [{
-      name: '图库管理',
-      path: 'picture',
-      icon: 'file-jpg',
-    }, {
-      name: '视频管理',
-      path: 'video',
-      icon: 'video-camera',
-    }, {
-      name: '有声读物',
-      path: 'audiobook',
-      icon: 'notification',
-    }],
-    authority: ['admin', 'platform'],
-  }, {
-    name: '产品加工',
-    icon: 'appstore-o',
-    path: 'product',
-    children: [{
-      name: '制作课件',
-      path: 'courseware',
-    }, {
-      name: '制作课',
-      path: 'lesson',
-    }, {
-      name: '制作课程',
-      path: 'course',
-    }, {
-      name: '制作配套',
-      path: 'support',
-    }, {
-      name: '制作师训',
-      path: 'training',
-    }, {
-      name: '制作套餐包',
-      path: 'package',
-    }],
-    authority: ['admin', 'platform'],
-  }, {
-    name: '产品出售',
+    name: '产品库',
     icon: 'shop',
     path: 'shelves',
     children: [{
-      name: '上架课程',
+      name: '课程',
       path: 'course',
     }, {
-      name: '上架配套',
+      name: '配套',
       path: 'support',
     }, {
-      name: '上架师训',
+      name: '师训',
       path: 'training',
     }, {
-      name: '上架套餐包',
+      name: '套餐包',
       path: 'package',
     }],
     authority: ['admin', 'platform'],
@@ -82,18 +40,6 @@ const menuData = () => {
     icon: 'android-o',
     path: 'frontend',
     children: [{
-      name: '首页入口',
-      path: 'tagGroup',
-    }, {
-      name: '栏目类型',
-      path: 'tagType',
-    }, {
-      name: '侧边栏目',
-      path: 'tag',
-    }, {
-      name: '推荐内容',
-      path: 'recommend',
-    }, {
       name: '用户配置',
       path: 'ConfigUser',
     }],
@@ -113,15 +59,6 @@ const menuData = () => {
     }],
     authority: ['admin', 'platform'],
   }, {
-    name: '厂商管理',
-    icon: 'team',
-    path: 'merchant',
-    children: [{
-      name: '商户列表',
-      path: 'list',
-    }],
-    authority: ['admin', 'platform'],
-  }, {
     name: '校区管理',
     icon: <AXIcon type="campus" />,
     path: 'campus',
@@ -137,9 +74,6 @@ const menuData = () => {
     children: [{
       name: '终端用户',
       path: 'user',
-    }, {
-      name: '白名单',
-      path: 'whitelist',
     }],
     authority: ['admin', 'platform', 'channel'],
   }, {

src/common/router.js

@@ -73,23 +73,6 @@ export const getRouterData = (app) => {
     '/': {
       component: dynamicWrapper(app, ['user', 'login'], () => import('../layouts/BasicLayout')),
     },
-    // 厂商管理相关路由注册
-    '/merchant/list': {
-      component: dynamicWrapper(app, ['merchant'], () => import('../routes/Merchant/MerchantList')),
-      name: '商户列表',
-    },
-    '/merchant/create': {
-      component: dynamicWrapper(app, ['merchant'], () => import('../routes/Merchant/MerchantCreate')),
-      name: '添加商户',
-    },
-    '/merchant/edit/:id': {
-      component: dynamicWrapper(app, ['merchant'], () => import('../routes/Merchant/MerchantCreate')),
-      name: '编辑商户',
-    },
-    '/merchant/deposit/:id': {
-      component: dynamicWrapper(app, ['merchant'], () => import('../routes/Merchant/MerchantDeposit')),
-      name: '余额充值',
-    },
     // 校区管理相关路由注册
     '/campus/list': {
       component: dynamicWrapper(app, ['campus', 'merchant'], () => import('../routes/Campus/CampusList')),
@@ -103,47 +86,6 @@ export const getRouterData = (app) => {
       component: dynamicWrapper(app, ['campus', 'merchant'], () => import('../routes/Campus/CampusCreate')),
       name: '编辑校区',
     },
-    // 资源管理相关路由注册
-    '/resource/picture': {
-      component: dynamicWrapper(app, ['resource'], () => import('../routes/Resource/Picture/PictureList')),
-    },
-    '/resource/picture-upload': {
-      component: dynamicWrapper(app, ['resource'], () => import('../routes/Resource/Picture/PictureUpload')),
-    },
-    '/resource/picture-upload/single': {
-      component: dynamicWrapper(app, ['resource'], () => import('../routes/Resource/Picture/PictureSingleUpload')),
-      name: '单图上传',
-    },
-    '/resource/picture-upload/result': {
-      component: dynamicWrapper(app, ['resource'], () => import('../routes/Resource/Picture/PictureUploadResult')),
-      name: '上传结果',
-    },
-    '/resource/picture-edit/:id': {
-      component: dynamicWrapper(app, ['resource'], () => import('../routes/Resource/Picture/PictureEdit')),
-      name: '编辑图片',
-    },
-    '/resource/video': {
-      component: dynamicWrapper(app, ['resource'], () => import('../routes/Resource/Video/VideoList')),
-    },
-    '/resource/video-create': {
-      component: dynamicWrapper(app, ['resource'], () => import('../routes/Resource/Video/VideoCreate')),
-      name: '创建视频',
-    },
-    '/resource/video-edit/:id': {
-      component: dynamicWrapper(app, ['resource'], () => import('../routes/Resource/Video/VideoCreate')),
-      name: '编辑视频',
-    },
-    '/resource/audiobook': {
-      component: dynamicWrapper(app, ['resource'], () => import('../routes/Resource/AudioBook/AudioBookList')),
-    },
-    '/resource/audiobook-create': {
-      component: dynamicWrapper(app, ['resource'], () => import('../routes/Resource/AudioBook/AudioBookCreate')),
-      name: '创建有声读物',
-    },
-    '/resource/audiobook-edit/:id': {
-      component: dynamicWrapper(app, ['resource'], () => import('../routes/Resource/AudioBook/AudioBookCreate')),
-      name: '编辑有声读物',
-    },
     // 系统管理相关路由注册
     '/system/cms-user': {
       component: dynamicWrapper(app, ['cmsUser'], () => import('../routes/System/CmsUser')),
@@ -170,91 +112,6 @@ export const getRouterData = (app) => {
     '/terminal/user/edit/:id': {
       component: dynamicWrapper(app, ['terminal'], () => import('../routes/Terminal/User/TerminalEdit')),
     },
-    '/terminal/whitelist': {
-      component: dynamicWrapper(app, ['terminal'], () => import('../routes/Terminal/WhiteList')),
-    },
-    '/terminal/whitelist/list': {
-      component: dynamicWrapper(app, ['terminal'], () => import('../routes/Terminal/WhiteList/WhiteList')),
-    },
-    '/terminal/whitelist/create': {
-      component: dynamicWrapper(app, ['terminal'], () => import('../routes/Terminal/WhiteList/WhiteListCreate')),
-    },
-    '/terminal/whitelist/edit/:id': {
-      component: dynamicWrapper(app, ['terminal'], () => import('../routes/Terminal/WhiteList/WhiteListCreate')),
-    },
-    // 产品管理相关路由注册
-    '/product/courseware': {
-      component: dynamicWrapper(app, [], () => import('../routes/Product/Courseware')),
-    },
-    '/product/courseware/list': {
-      component: dynamicWrapper(app, ['courseware'], () => import('../routes/Product/Courseware/CoursewareList')),
-    },
-    '/product/courseware/create': {
-      component: dynamicWrapper(app, ['courseware', 'resource'], () => import('../routes/Product/Courseware/CoursewareCreate')),
-    },
-    '/product/courseware/edit/:id': {
-      component: dynamicWrapper(app, ['courseware', 'resource'], () => import('../routes/Product/Courseware/CoursewareCreate')),
-    },
-    '/product/lesson': {
-      component: dynamicWrapper(app, ['lesson'], () => import('../routes/Product/Lesson')),
-    },
-    '/product/lesson/list': {
-      component: dynamicWrapper(app, ['lesson'], () => import('../routes/Product/Lesson/LessonList')),
-    },
-    '/product/lesson/create': {
-      component: dynamicWrapper(app, ['lesson', 'courseware'], () => import('../routes/Product/Lesson/LessonCreate')),
-    },
-    '/product/lesson/edit/:id': {
-      component: dynamicWrapper(app, ['lesson', 'courseware'], () => import('../routes/Product/Lesson/LessonCreate')),
-    },
-    '/product/course': {
-      component: dynamicWrapper(app, ['product'], () => import('../routes/Product/Course')),
-    },
-    '/product/course/list': {
-      component: dynamicWrapper(app, ['product'], () => import('../routes/Product/Course/CourseList')),
-    },
-    '/product/course/create': {
-      component: dynamicWrapper(app, ['lesson', 'resource', 'product', 'merchant'], () => import('../routes/Product/Course/CourseCreate')),
-    },
-    '/product/course/edit/:id': {
-      component: dynamicWrapper(app, ['lesson', 'resource', 'product', 'merchant'], () => import('../routes/Product/Course/CourseCreate')),
-    },
-    '/product/support': {
-      component: dynamicWrapper(app, ['product'], () => import('../routes/Product/Support')),
-    },
-    '/product/support/list': {
-      component: dynamicWrapper(app, ['product'], () => import('../routes/Product/Support/SupportList')),
-    },
-    '/product/support/create': {
-      component: dynamicWrapper(app, ['resource', 'product', 'merchant'], () => import('../routes/Product/Support/SupportCreate')),
-    },
-    '/product/support/edit/:id': {
-      component: dynamicWrapper(app, ['resource', 'product', 'merchant'], () => import('../routes/Product/Support/SupportCreate')),
-    },
-    '/product/training': {
-      component: dynamicWrapper(app, ['product'], () => import('../routes/Product/Training')),
-    },
-    '/product/training/list': {
-      component: dynamicWrapper(app, ['product'], () => import('../routes/Product/Training/TrainingList')),
-    },
-    '/product/training/create': {
-      component: dynamicWrapper(app, ['resource', 'product', 'merchant'], () => import('../routes/Product/Training/TrainingCreate')),
-    },
-    '/product/training/edit/:id': {
-      component: dynamicWrapper(app, ['resource', 'product', 'merchant'], () => import('../routes/Product/Training/TrainingCreate')),
-    },
-    '/product/package': {
-      component: dynamicWrapper(app, ['product'], () => import('../routes/Product/Package')),
-    },
-    '/product/package/list': {
-      component: dynamicWrapper(app, ['product'], () => import('../routes/Product/Package/PackageList')),
-    },
-    '/product/package/create': {
-      component: dynamicWrapper(app, ['product'], () => import('../routes/Product/Package/PackageCreate')),
-    },
-    '/product/package/edit/:id': {
-      component: dynamicWrapper(app, ['product'], () => import('../routes/Product/Package/PackageCreate')),
-    },
     // 产品出售相关路由注册
     '/shelves/course': {
       component: dynamicWrapper(app, ['shelves'], () => import('../routes/Shelves')),
@@ -265,6 +122,7 @@ export const getRouterData = (app) => {
     '/shelves/course/create': {
       component: dynamicWrapper(app, ['shelves'], () => import('../routes/Shelves/ShelvesCreate')),
     },
+    // 查看页面
     '/shelves/course/edit': {
       component: dynamicWrapper(app, ['shelves', 'resource'], () => import('../routes/Shelves/ShelvesEdit')),
     },
@@ -305,54 +163,6 @@ export const getRouterData = (app) => {
       component: dynamicWrapper(app, ['shelves', 'resource'], () => import('../routes/Shelves/ShelvesEdit')),
     },
     // 前端管理相关路由注册
-    '/frontend/tagGroup': {
-      component: dynamicWrapper(app, ['tagGroup'], () => import('../routes/Frontend/TagGroup')),
-    },
-    '/frontend/tagGroup/list': {
-      component: dynamicWrapper(app, ['tagGroup'], () => import('../routes/Frontend/TagGroup/TagGroupList')),
-    },
-    '/frontend/tagGroup/create': {
-      component: dynamicWrapper(app, ['tagGroup', 'merchant'], () => import('../routes/Frontend/TagGroup/TagGroupCreate')),
-    },
-    '/frontend/tagGroup/edit/:id': {
-      component: dynamicWrapper(app, ['tagGroup', 'merchant'], () => import('../routes/Frontend/TagGroup/TagGroupCreate')),
-    },
-    '/frontend/tagType': {
-      component: dynamicWrapper(app, ['tagType'], () => import('../routes/Frontend/TagType')),
-    },
-    '/frontend/tagType/list': {
-      component: dynamicWrapper(app, ['tagType'], () => import('../routes/Frontend/TagType/TagTypeList')),
-    },
-    '/frontend/tagType/create': {
-      component: dynamicWrapper(app, ['tagType', 'merchant'], () => import('../routes/Frontend/TagType/TagTypeCreate')),
-    },
-    '/frontend/tagType/edit/:id': {
-      component: dynamicWrapper(app, ['tagType', 'merchant'], () => import('../routes/Frontend/TagType/TagTypeCreate')),
-    },
-    '/frontend/tag': {
-      component: dynamicWrapper(app, ['tag'], () => import('../routes/Frontend/Tag')),
-    },
-    '/frontend/tag/list': {
-      component: dynamicWrapper(app, ['tag'], () => import('../routes/Frontend/Tag/TagList')),
-    },
-    '/frontend/tag/create': {
-      component: dynamicWrapper(app, ['tag', 'tagGroup', 'shelves'], () => import('../routes/Frontend/Tag/TagCreate')),
-    },
-    '/frontend/tag/edit/:id': {
-      component: dynamicWrapper(app, ['tag', 'tagGroup', 'shelves'], () => import('../routes/Frontend/Tag/TagCreate')),
-    },
-    '/frontend/recommend': {
-      component: dynamicWrapper(app, ['merchant'], () => import('../routes/Frontend/Recommend')),
-    },
-    '/frontend/recommend/merchant-list': {
-      component: dynamicWrapper(app, ['merchant'], () => import('../routes/Frontend/Recommend/RecommendList')),
-    },
-    '/frontend/recommend/course-edit/:id': {
-      component: dynamicWrapper(app, ['merchant', 'shelves'], () => import('../routes/Frontend/Recommend/RecommendCourse')),
-    },
-    '/frontend/recommend/poster-edit/:id': {
-      component: dynamicWrapper(app, ['merchant', 'shelves'], () => import('../routes/Frontend/Recommend/RecommendPoster')),
-    },
     '/frontend/ConfigUser': {
       component: dynamicWrapper(app, ['configUser'], () => import('../routes/Frontend/ConfigUser')),
     },
@@ -368,6 +178,7 @@ export const getRouterData = (app) => {
     '/frontend/ConfigUser/poster-edit/:id': {
       component: dynamicWrapper(app, ['configUser', 'tag', 'tagType'], () => import('../routes/Frontend/ConfigUser/ConfigRecommendPoster')),
     },
+    // 交易管理
     '/trade/shopcart': {
       component: dynamicWrapper(app, [], () => import('../routes/Trade/ShopCart')),
     },

src/routes/Campus/CampusList.js

@@ -2,35 +2,14 @@ import React, { Component } from 'react';
 import moment from 'moment';
 import { connect } from 'dva';
 import { routerRedux } from 'dva/router';
-import { Card, Modal, Form, Button, message } from 'antd';
+import { Card, Form, Button, message } from 'antd';
 import { StandardTableList } from '../../components/AXList';
 import Ellipsis from '../../components/Ellipsis';
-import AXRemoteSelect from '../../components/AXRemoteSelect';
 import PageHeaderLayout from '../../layouts/PageHeaderLayout';
 import { addRowKey } from '../../utils/utils';
 
 const Message = message;
 
-const formItemLayout = {
-  labelCol: {
-    xs: { span: 24 },
-    sm: { span: 7 },
-  },
-  wrapperCol: {
-    xs: { span: 24 },
-    sm: { span: 15 },
-    md: { span: 13 },
-  },
-};
-function merchantDataFormatter(data) {
-  return data.map((item) => {
-    return {
-      text: item.name,
-      value: item.id,
-    };
-  });
-}
-
 @Form.create()
 @connect(({ loading, campus, merchant }) => ({
   campus,
@@ -100,10 +79,8 @@ export default class CampusListPage extends Component {
   }
 
   render() {
-    const { loading, fetching, form, campus, merchant } = this.props;
+    const { loading, campus } = this.props;
     const { list, totalSize, pageSize, pageNo } = campus;
-    const { getFieldDecorator } = form;
-
     const renderOperation = (item) => {
       return (
         <div>

src/routes/Shelves/ShelvesEdit.js

@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import pathToRegexp from 'path-to-regexp';
-import { Card, Modal, Form, Button, Tag, Icon } from 'antd';
+import { Card, Modal, Form, Button, Tag } from 'antd';
 import { connect } from 'dva';
 import { routerRedux } from 'dva/router';
 import TableForm from './TableForm';
@@ -203,7 +203,7 @@ export default class ShelvesEdit extends Component {
           )}
         </Card>
         <Card title="栏目管理" style={{ marginBottom: 70 }}>
-          {tags && tags.map((item, index) => (
+          {tags && tags.map(item => (
             <Tag
               color="#87d068"
               key={item.id}

src/routes/Shelves/TableForm.js

@@ -1,11 +1,8 @@
 import React, { PureComponent, Fragment } from 'react';
 import {
   Table,
-  Button,
   Select,
   InputNumber,
-  Popconfirm,
-  Divider,
   Modal,
   message,
 } from 'antd';

src/routes/Terminal/User/TerminalList.js

@@ -170,7 +170,7 @@ export default class TerminalListPage extends Component {
   }
 
   render() {
-    const { loading, fetching1, fetching2, form, campus, merchant, terminal } = this.props;
+    const { loading, fetching2, form, campus, terminal } = this.props;
     const { list, totalSize, pageSize, pageNo } = terminal;
     const { getFieldDecorator } = form;
     const renderCampusName = (name) => {

src/routes/Trade/ShopCart/ShopCartList.js

@@ -116,7 +116,7 @@ export default class ShopCartListPage extends Component {
   };
 
   render() {
-    const { loading, fetching1, fetching2, form, campus, merchant, terminal } = this.props;
+    const { loading, fetching2, form, campus, terminal } = this.props;
     const { list, totalSize, pageSize, pageNo } = terminal;
     const { getFieldDecorator } = form;
 

src/utils/config.js

@@ -71,7 +71,7 @@ Hotax.PAGE_SIZE = 20;
 // 上传文件最大尺寸
 Hotax.FILE_MAX_SIZE = 5; // Index max size should below 5M
 // 项目名称
-Hotax.PROJECT_NAME = 'Taurus';
+Hotax.PROJECT_NAME = '渠道管理平台';
 // 版权声明
 Hotax.CopyRight = '2017-2020 领教信息科技有限公司';
 // 接口地址(测试)