1.调整菜单结构;

2.优化各模块的显示结构;

src/common/menu.js

@@ -4,17 +4,6 @@ const menuData = [
     icon: 'dashboard',
     path: 'dashboard',
   },{
-    name: '资源管理',
-    icon: 'folder',
-    path: 'resource',
-    children: [{
-      name: '图库管理',
-      path: 'gallery',
-    },{
-      name: '视频管理',
-      path: 'video',
-    }]
-  },{
     name: '标签管理',
     icon: 'tags',
     path: 'tag',
@@ -26,16 +15,32 @@ const menuData = [
       path: 'tagItem',
     }]
   },{
-    name: '产品管理',
-    icon: 'appstore',
-    path: 'product',
+    name: '资源管理',
+    icon: 'folder',
+    path: 'resource',
+    children: [{
+      name: '图库管理',
+      path: 'gallery',
+    },{
+      name: '视频管理',
+      path: 'video',
+    }]
+  },{
+    name: '基础产品',
+    icon: 'inbox',
+    path: 'basic-product',
     children: [{
       name: '课件管理',
       path: 'ware',
     },{
       name: '课管理',
       path: 'lesson',
-    },{
+    }],
+  },{
+    name: '可售产品',
+    icon: 'appstore',
+    path: 'product',
+    children: [{
       name: '课程管理',
       path: 'course',
     },{

src/common/router.js

@@ -95,25 +95,25 @@ export const getRouterData = (app) => {
       component: dynamicWrapper(app, ['tag/detail', 'group/group'], () => import('../routes/Tag/Edit')),
       name: '修改标签',
     },
-    '/product/ware': {
+    '/basic-product/ware': {
       component: dynamicWrapper(app, ['ware/ware'], () => import('../routes/Ware/List')),
     },
-    '/product/ware/add': {
+    '/basic-product/ware/add': {
       component: dynamicWrapper(app, ['ware/detail', 'resource'], () => import('../routes/Ware/Edit')),
       name: '创建课件',
     },
-    '/product/ware/edit/:id': {
+    '/basic-product/ware/edit/:id': {
       component: dynamicWrapper(app, ['ware/detail', 'resource'], () => import('../routes/Ware/Edit')),
       name: '修改课件',
     },
-    '/product/lesson': {
+    '/basic-product/lesson': {
       component: dynamicWrapper(app, ['lesson/lesson'], () => import('../routes/Lesson/List')),
     },
-    '/product/lesson/add': {
+    '/basic-product/lesson/add': {
       component: dynamicWrapper(app, ['lesson/detail', 'ware/ware'], () => import('../routes/Lesson/Edit')),
       name: '创建课',
     },
-    '/product/lesson/edit/:id': {
+    '/basic-product/lesson/edit/:id': {
       component: dynamicWrapper(app, ['lesson/detail', 'ware/ware'], () => import('../routes/Lesson/Edit')),
       name: '修改课',
     },

src/models/lesson/detail.js

@@ -17,13 +17,13 @@ export default {
   subscriptions: {
     setup({ dispatch, history }) {
       history.listen(({ pathname, state, ...rest }) => {
-        const match = pathToRegexp('/product/lesson/edit/:id').exec(pathname);
+        const match = pathToRegexp('/basic-product/lesson/edit/:id').exec(pathname);
         if (match) {
           dispatch({ type: 'query', payload: { id: match[1] } });
           dispatch({ type: 'saveFilters', payload: state });
           dispatch({ type: 'saveOperType', payload: { operType: 'update' } });
         }
-        if (pathname === '/product/lesson/add') {
+        if (pathname === '/basic-product/lesson/add') {
           dispatch({ type: 'saveFilters', payload: state });
           dispatch({ type: 'saveFilters', payload: state });
           dispatch({ type: 'saveOperType', payload: { operType: 'create' } });

src/models/lesson/lesson.js

@@ -19,7 +19,7 @@ export default modelExtend(pageModel, {
   subscriptions: {
     setup({ dispatch, history }) {
       history.listen((location) => {
-        if (location.pathname === '/product/lesson') {
+        if (location.pathname === '/basic-product/lesson') {
           const payload = checkSearchParams(queryString.parse(location.search));
           dispatch({
             type: 'query',

src/models/login.js

@@ -9,7 +9,7 @@ export default {
     loading: false,
   },
   effects: {
-    *login({ payload }, { put, call }) {
+    *login({ payload }, { put, call, select }) {
       yield put({ type: 'save', payload: { loading: true } });
       const { data, success } = yield call(login, payload);
       if (success) {

src/models/support/detail.js

@@ -86,6 +86,10 @@ export default {
       const currentItem = { ...state.currentItem, supportList };
       return { ...state, supportModalVisible: false, currentItem };
     },
+    saveCoverImg(state, { payload: { coverUrl } }) {
+      const currentItem = { ...state.currentItem, coverUrl };
+      return { ...state, resourceModalVisible: false, currentItem };
+    },
     saveImgList(state, { payload: { imgList } }) {
       const currentItem = { ...state.currentItem, imgList };
       return { ...state, resourceModalVisible: false, currentItem };

src/models/tag/detail.js

@@ -62,32 +62,25 @@ export default {
     changeLoading(state, { payload }) {
       return { ...state, ...payload };
     },
-
     querySuccess(state, { payload }) {
       return { ...state, currentItem: payload };
     },
-
     saveFilters(state, { payload: filters }) {
       return { ...state, filters };
     },
-
     showModal(state) {
       return { ...state, modalVisible: true };
     },
-
     hideModal(state) {
       return { ...state, modalVisible: false };
     },
-
     saveOperType(state, { payload }) {
       return { ...state, ...payload };
     },
-
     saveSortResult(state, { payload: { itemList } }) {
       const currentItem = { ...state.currentItem, itemList };
       return { ...state, modalVisible: false, currentItem };
     },
-
     initState(state) {
       return { ...state, currentItem: {}, itemLoading: false };
     }

src/models/ware/detail.js

@@ -16,13 +16,13 @@ export default {
   subscriptions: {
     setup({ dispatch, history }) {
       history.listen(({ pathname, state, ...rest }) => {
-        const match = pathToRegexp('/product/ware/edit/:id').exec(pathname);
+        const match = pathToRegexp('/basic-product/ware/edit/:id').exec(pathname);
         if (match) {
           dispatch({ type: 'query', payload: { id: match[1] } });
           dispatch({ type: 'saveFilters', payload: state });
           dispatch({ type: 'saveOperType', payload: { operType: 'update' } });
         }
-        if (pathname === '/product/ware/add') {
+        if (pathname === '/basic-product/ware/add') {
           dispatch({ type: 'saveFilters', payload: state });
           dispatch({ type: 'saveFilters', payload: state });
           dispatch({ type: 'saveOperType', payload: { operType: 'create' } });

src/models/ware/ware.js

@@ -19,7 +19,7 @@ export default modelExtend(pageModel, {
   subscriptions: {
     setup({ dispatch, history }) {
       history.listen((location) => {
-        if (location.pathname === '/product/ware') {
+        if (location.pathname === '/basic-product/ware') {
           const payload = checkSearchParams(queryString.parse(location.search));
           dispatch({
             type: 'query',

src/routes/Course/Edit/index.js

@@ -8,7 +8,7 @@ import PageHeaderLayout from '../../../layouts/PageHeaderLayout';
 import LessonSelectSortModal from './lesson';
 import ResourceSelectModal from './resource';
 import SupportSelectSortModal from './support';
-import { Codes } from '../../../utils/config';
+import { Codes, ossHost } from '../../../utils/config';
 
 const FormItem = Form.Item;
 const Option = Select.Option;
@@ -105,12 +105,12 @@ export default class CourseDetail extends PureComponent {
     } else if (curClickedBtn === 'cvImgBtn') {
       dispatch({
         type: 'courseDetail/saveCoverImg',
-        payload: { coverUrl: data.url },
+        payload: { coverUrl: data.path },
       });
     } else if (curClickedBtn === 'bgImgBtn') {
       dispatch({
         type: 'courseDetail/saveBackgroundImg',
-        payload: { bgUrl: data.url },
+        payload: { bgUrl: data.path },
       });
     } else if (curClickedBtn === 'supportBtn') {
       dispatch({
@@ -364,22 +364,22 @@ export default class CourseDetail extends PureComponent {
               </FormItem>
               <FormItem label="封面图片" {...formItemLayout}>
                 <Button onClick={() => this.handleModalShow('cvImgBtn')} type="primary" icon="select" size="small">选择</Button>
-                {coverUrl === undefined ? null :
+                {!coverUrl ? null :
                   <Card
                     hoverable
                     bordered
-                    cover={<img alt="" src={coverUrl} />}
+                    cover={<img alt="" src={coverUrl.startsWith('http') ? coverUrl : `${ossHost}/${coverUrl}`} />}
                     style={{ width: 240, marginTop: 20 }}
                   >
                   </Card>}
               </FormItem>
               <FormItem label="背景图片" {...formItemLayout}>
                 <Button onClick={() => this.handleModalShow('bgImgBtn')} type="primary" icon="select" size="small">选择</Button>
-                {bgUrl === undefined ? null :
+                {!bgUrl ? null :
                   <Card
                   hoverable
                   bordered
-                  cover={<img alt="" src={bgUrl} />}
+                  cover={<img alt="" src={bgUrl.startsWith('http') ? bgUrl : `${ossHost}/${bgUrl}`} />}
                   style={{ width: 240, marginTop: 20 }}
                 >
                 </Card>}

src/routes/Course/Edit/resource.js

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { Badge, Popover, Icon } from 'antd';
 import SelectModal from '../../../components/SelectModal';
 import styles from './resource.less';
-import { Codes } from '../../../utils/config';
+import { Codes, ossHost } from '../../../utils/config';
 
 export default class ResourceSelectModal extends PureComponent {
   static propTypes = {
@@ -33,7 +33,7 @@ export default class ResourceSelectModal extends PureComponent {
         value: 'code', name: '图片编号', mode: 'input',
       }],
       searchSelectProps: {
-        defaultValue: 'name',
+        defaultValue: 'code',
       },
       onSearch: (value) => {
         onSearch(value);
@@ -49,10 +49,10 @@ export default class ResourceSelectModal extends PureComponent {
         key: 'url',
         render: (text, record) => (
           <Popover
-            content={<img alt="" src={record.url} width={350} />}
+            content={<img alt="" src={`${ossHost}/${record.path}`} width={350} />}
             title={record.name}
           >
-            <img alt="" src={record.url} width={70} />
+            <img alt="" src={`${ossHost}/${record.path}`} width={70} />
           </Popover>
         ),
       },{

src/routes/Lesson/Edit/index.js

@@ -121,7 +121,7 @@ export default class LessonDetail extends PureComponent {
         callback: () => {
           dispatch(
             routerRedux.push({
-              pathname: '/product/lesson',
+              pathname: '/basic-product/lesson',
               search: queryString.stringify(filters),
             })
           );
@@ -136,7 +136,7 @@ export default class LessonDetail extends PureComponent {
     dispatch({ type: 'lessonDetail/initState' });
     dispatch(
       routerRedux.push({
-        pathname: '/product/lesson',
+        pathname: '/basic-product/lesson',
         search: queryString.stringify(filters),
       })
     );

src/routes/Lesson/List/index.js

@@ -53,7 +53,7 @@ export default class Lesson extends PureComponent {
       onAdd: () => {
         dispatch(
           routerRedux.push({
-            pathname: '/product/lesson/add',
+            pathname: '/basic-product/lesson/add',
             state: filters,
           })
         );
@@ -88,7 +88,7 @@ export default class Lesson extends PureComponent {
       onEditItem: (item) => {
         dispatch(
           routerRedux.push({
-            pathname: `/product/lesson/edit/${item.id}`,
+            pathname: `/basic-product/lesson/edit/${item.id}`,
             state: filters,
           })
         );

src/routes/MProduct/Add/course.js

@@ -32,7 +32,7 @@ export default class CourseSelectModal extends PureComponent {
         value: 'code', name: '课程编号', mode: 'input',
       }],
       searchSelectProps: {
-        defaultValue: 'name',
+        defaultValue: 'code',
       },
       onSearch: (value) => {
         onSearch(value);
@@ -42,6 +42,7 @@ export default class CourseSelectModal extends PureComponent {
     //待选资源Table属性
     const fsTableProps = {
       fsTableColumns: [{
+        /*
         title: '封面图',
         dataIndex: 'url',
         key: 'url',
@@ -55,15 +56,16 @@ export default class CourseSelectModal extends PureComponent {
         ),
         width: '26%',
       },{
+      */
         title: '课程编号',
         dataIndex: 'code',
         key: 'code',
-        width: '27%',
+        width: '40%',
       },{
         title: '课程名称',
         dataIndex: 'name',
         key: 'name',
-        width: '27%',
+        width: '40%',
       }],
       ...fsTableOpts,
     }

src/routes/MProduct/Add/index.js

@@ -3,7 +3,7 @@ import { routerRedux } from 'dva/router';
 import PropTypes from 'prop-types';
 import queryString from 'query-string';
 import { connect } from 'dva';
-import { Upload, Spin, Switch, Popover, Badge, Table, Radio, Card, Form, Input, Icon, Button, Select } from 'antd';
+import { List, Switch, Table, Radio, Card, Form, Input, Icon, Button, Select } from 'antd';
 import PageHeaderLayout from '../../../layouts/PageHeaderLayout';
 import CourseSelectModal from './course';
 import SupportSelectModal from './support';
@@ -289,7 +289,7 @@ export default class MerchantProductCreate extends PureComponent {
             <FormItem label="选择渠道：" {...formItemLayout}>
               {getFieldDecorator('merchantId', {
                 rules: [{ required: true, type: 'string', message: '此项为必选项!' }],
-              })(<Select placeholder="请选择" style={{ width: '43%' }}>{merchant.list.map(item => <Option value={item.id} key={item.id}>{item.name}</Option>)}</Select>)}
+              })(<Select placeholder="请选择" style={{ width: '60%' }}>{merchant.list.map(item => <Option value={item.id} key={item.id}>{item.name}</Option>)}</Select>)}
             </FormItem>
             <FormItem label="产品类型：" {...formItemLayout}>
               {getFieldDecorator('type', {
@@ -305,9 +305,7 @@ export default class MerchantProductCreate extends PureComponent {
             </FormItem>
             <FormItem label={this.renderLabelName()} {...formItemLayout}>
               <Button size="small" type="primary" icon="select" onClick={() => this.handleModalShow(radioType)}>选择</Button>
-            </FormItem>
-            <FormItem {...submitFormLayout}>
-              {selectItem ?
+              {/*selectItem ?
                 <Card
                   title={selectItem.name}
                   hoverable
@@ -316,6 +314,19 @@ export default class MerchantProductCreate extends PureComponent {
                 >
                 </Card> :
                 <Button type="dashed" className={styles.newButton}>未选择</Button>
+              */}
+              {selectItem ?
+                <List
+                  size="small"
+                  bordered
+                  style={{ width: '60%' }}
+                  dataSource={[
+                    `产品编号: ${selectItem.code}`,
+                    `产品名称: ${selectItem.name}`,
+                    `产品类型: ${productType[selectItem.type]}`,
+                  ]}
+                  renderItem={item => <List.Item>{item}</List.Item>}
+                /> : null
               }
             </FormItem>
             <FormItem label="上架状态：" {...formItemLayout}>

src/routes/MProduct/Add/package.js

@@ -32,7 +32,7 @@ export default class PackageSelectModal extends PureComponent {
         value: 'code', name: '课程包编号', mode: 'input',
       }],
       searchSelectProps: {
-        defaultValue: 'name',
+        defaultValue: 'code',
       },
       onSearch: (value) => {
         onSearch(value);
@@ -42,6 +42,7 @@ export default class PackageSelectModal extends PureComponent {
     //待选资源Table属性
     const fsTableProps = {
       fsTableColumns: [{
+        /*
         title: '封面图',
         dataIndex: 'url',
         key: 'url',
@@ -55,15 +56,16 @@ export default class PackageSelectModal extends PureComponent {
         ),
         width: '30%',
       },{
+      */
         title: '课程包编号',
         dataIndex: 'code',
         key: 'code',
-        width: '25%',
+        width: '40%',
       },{
         title: '课程包名称',
         dataIndex: 'name',
         key: 'name',
-        width: '25%',
+        width: '40%',
       }],
       ...fsTableOpts,
     }

src/routes/MProduct/Add/support.js

@@ -32,7 +32,7 @@ export default class SupportSelectModal extends PureComponent {
         value: 'code', name: '配套编号', mode: 'input',
       }],
       searchSelectProps: {
-        defaultValue: 'name',
+        defaultValue: 'code',
       },
       onSearch: (value) => {
         onSearch(value);
@@ -42,6 +42,7 @@ export default class SupportSelectModal extends PureComponent {
     //待选资源Table属性
     const fsTableProps = {
       fsTableColumns: [{
+        /*
         title: '封面图',
         dataIndex: 'url',
         key: 'url',
@@ -54,13 +55,16 @@ export default class SupportSelectModal extends PureComponent {
           </Popover>
         ),
       },{
+      */
         title: '配套编号',
         dataIndex: 'code',
         key: 'code',
+        width: '40%',
       },{
         title: '配套名称',
         dataIndex: 'name',
         key: 'name',
+        width: '40%',
       }],
       ...fsTableOpts,
     }

src/routes/MProduct/Edit/index.js

@@ -70,7 +70,6 @@ export default class MerchantProductEdit extends PureComponent {
       payload: {
         pageNo: 1,
         pageSize,
-        status: Codes.CODE_NORMAL,
         merchantId,
       }
     });
@@ -115,7 +114,6 @@ export default class MerchantProductEdit extends PureComponent {
         ...newData,
         pageNo: 1,
         pageSize,
-        status: Codes.CODE_NORMAL,
         merchantId,
       }
     });
@@ -147,7 +145,6 @@ export default class MerchantProductEdit extends PureComponent {
       ...newFilters,
       pageNo: pagination.current,
       pageSize: pagination.pageSize,
-      status: Codes.CODE_NORMAL,
       merchantId,
     };
 

src/routes/MProduct/Edit/price.js

@@ -12,7 +12,6 @@ export default class NewPriceModal extends PureComponent {
       form: {
         validateFields,
         getFieldsValue,
-        resetFields,
       },
       data,
       onSubmit,
@@ -24,7 +23,6 @@ export default class NewPriceModal extends PureComponent {
       newData.duration = chargeUnit[formData.chargeUnit];
       data.id ? newData.id = data.id : null;
       onSubmit(newData);
-      resetFields();
     });
   }
 

src/routes/Order/List/table.js

@@ -134,15 +134,15 @@ export default class TableList extends PureComponent {
         <span>{`${record.provinceCode}-${record.cityName}-${record.zoneName}`}</span>
       ),
     },{
-      title: '商品标价(¥)',
+      title: '商品标价',
       dataIndex: 'originPrice',
       key: 'originPrice',
     },{
-      title: '实际售价(¥)',
+      title: '实际售价',
       dataIndex: 'finalPrice',
       key: 'finalPrice',
     },{
-      title: '价格调整(¥)',
+      title: '价格调整',
       dataIndex: 'adjustPrice',
       key: 'adjustPrice',
     },{
@@ -203,7 +203,6 @@ export default class TableList extends PureComponent {
         { ...tableProps }
         columns={columns}
         className={classnames({ [styles.table]: true, [styles.motion]: true })}
-        scroll={{ x: 1200 }}
         rowKey={record => record.id}
         components={{
           body: { wrapper: AnimationTableBody }

src/routes/Resource/gallery/modal.js

@@ -19,7 +19,7 @@ export default class ModalForm extends PureComponent {
         format: suffix,
         size: file.size,
         code: name,
-        path: `${fileName}`,
+        path: `${signature.dir}${fileName}`,
         url: `${signature.host}/${signature.dir}${fileName}`,
       };
       message.success('图片上传成功!');

src/routes/Resource/gallery/table.js

@@ -5,7 +5,7 @@ import classnames from 'classnames';
 import queryString from 'query-string';
 import { Divider, Popover, Modal, Table, Menu, Icon, Badge } from 'antd';
 import AnimTableBody from '../../../components/Animation/AnimTableBody';
-import { statuses, Codes } from '../../../utils/config'
+import { statuses, Codes, ossHost } from '../../../utils/config'
 import styles from './table.less';
 
 export default class TableList extends PureComponent {
@@ -33,11 +33,11 @@ export default class TableList extends PureComponent {
       key: 'url',
       render: (text, record) => (
         <Popover
-          content={<img alt="" src={record.url} width={250} />}
+          content={<img alt="" src={`${ossHost}/${record.path}`} width={250} />}
           title={record.name}
           placement="top"
         >
-          <img alt="" src={record.url} width={70} />
+          <img alt="" src={`${ossHost}/${record.path}`} width={70} />
         </Popover>
       )
     },{

src/routes/Support/Edit/index.js

@@ -5,9 +5,9 @@ import queryString from 'query-string';
 import { connect } from 'dva';
 import { Spin, Popover, Badge, Table, Radio, Card, Form, Input, Icon, Button, Select } from 'antd';
 import PageHeaderLayout from '../../../layouts/PageHeaderLayout';
-import SupportSelectSortModal from './supportModal';
-import ResourceSelectModal from './resourceModal';
-import { Codes } from '../../../utils/config';
+import SupportSelectSortModal from './support';
+import ResourceSelectModal from './resource';
+import { Codes, ossHost } from '../../../utils/config';
 
 const FormItem = Form.Item;
 const Option = Select.Option;
@@ -45,7 +45,7 @@ export default class SupportDetail extends PureComponent {
       curClickedBtn: btnName,
     }, () => {
       const { dispatch } = this.props;
-      if (btnName === 'supportBtn') {
+      if (btnName == 'supportBtn') {
         dispatch({ type: 'supportDetail/showSupportModal' });
         dispatch({
           type: 'support/query',
@@ -54,8 +54,7 @@ export default class SupportDetail extends PureComponent {
             pageSize: 10,
           }
         });
-      }
-      if (btnName === 'imgBtn') {
+      } else if (btnName == 'imgBtn' || btnName == 'cvImgBtn') {
         dispatch({ type: 'supportDetail/showResourceModal' });
         dispatch({
           type: 'resource/query',
@@ -73,10 +72,10 @@ export default class SupportDetail extends PureComponent {
   handleModalCancel = () => {
     const { curClickedBtn } = this.state;
     const { dispatch } = this.props;
-    if (curClickedBtn === 'supportBtn') {
+    if (curClickedBtn == 'supportBtn') {
       dispatch({ type: 'supportDetail/hideSupportModal' });
     }
-    if (curClickedBtn === 'imgBtn') {
+    if (curClickedBtn == 'imgBtn' || curClickedBtn == 'cvImgBtn') {
       dispatch({ type: 'supportDetail/hideResourceModal' });
     }
   }
@@ -85,16 +84,21 @@ export default class SupportDetail extends PureComponent {
   handleModalOk = (data) => {
     const { curClickedBtn } = this.state;
     const { dispatch } = this.props;
-    if (curClickedBtn === 'supportBtn') {
+    if (curClickedBtn == 'supportBtn') {
       dispatch({
         type: 'supportDetail/saveSupportList',
         payload: { supportList: data }
       });
-    } else if (curClickedBtn === 'imgBtn') {
+    } else if (curClickedBtn == 'imgBtn') {
       dispatch({
         type: 'supportDetail/saveImgList',
         payload: { imgList: data },
       });
+    } else if (curClickedBtn == 'cvImgBtn') {
+      dispatch({
+        type: 'supportDetail/saveCoverImg',
+        payload: { coverUrl: data.path },
+      });
     }
   }
 
@@ -109,12 +113,12 @@ export default class SupportDetail extends PureComponent {
     delete newData.field;
     delete newData.keyword;
 
-    if (curClickedBtn === 'supportBtn') {
+    if (curClickedBtn == 'supportBtn') {
       dispatch({
         type: `support/query`,
         payload: { ...newData, pageNo: 1, pageSize: 10, status: Codes.CODE_NORMAL },
       });
-    } else if (curClickedBtn === 'imgBtn') {
+    } else if (curClickedBtn == 'imgBtn' || curClickedBtn == 'cvImgBtn') {
       dispatch({
         type: `resource/query`,
         payload: { ...newData, pageNo: 1, pageSize: 10, status: Codes.CODE_NORMAL, type: Codes.CODE_IMAGE },
@@ -145,9 +149,9 @@ export default class SupportDetail extends PureComponent {
     const data = { ...newFilters, ...tableFilters, pageNo: pagination.current, pageSize: pagination.pageSize };
     Object.keys(data).map(key => data[key] ? null : delete data[key]);
 
-    if (curClickedBtn === 'supportBtn') {
+    if (curClickedBtn == 'supportBtn') {
       dispatch({ type: `support/query`, payload: { ...data, status: Codes.CODE_NORMAL } });
-    } else if (curClickedBtn === 'imgBtn') {
+    } else if (curClickedBtn == 'imgBtn' || curClickedBtn == 'cvImgBtn') {
       dispatch({ type: `resource/query`, payload: { ...data, status: Codes.CODE_NORMAL, type: Codes.CODE_IMAGE } });
     }
   }
@@ -250,9 +254,11 @@ export default class SupportDetail extends PureComponent {
       code,
       digest,
       detail,
-      imgList = [],
-      supportList = [],
+      coverUrl,
+      imgList,
+      supportList,
     } = currentItem;
+    const { curClickedBtn } = this.state;
 
     // 待选表格去掉分页的跳转及变换页码
     if (resource && resource.pagination) {
@@ -276,10 +282,10 @@ export default class SupportDetail extends PureComponent {
       key: 'url',
       render: (text, record) => (
           <Popover
-            content={<img alt="" src={record.url} width={350} />}
+            content={<img alt="" src={`${ossHost}/${record.path}`} width={350} />}
             title={record.name}
           >
-            <img alt="" src={record.url} width={70} />
+            <img alt="" src={`${ossHost}/${record.path}`} width={70} />
           </Popover>
       ),
     },{
@@ -341,7 +347,18 @@ export default class SupportDetail extends PureComponent {
                   <Select placeholder="请选择">{merchant.list.map(item => <Option value={item.id} key={item.id}>{item.name}</Option>)}</Select>
                 )}
               </FormItem>
-              <FormItem label="选择图片" {...formItemLayout}>
+              <FormItem label="封面图片" {...formItemLayout}>
+                <Button onClick={() => this.handleModalShow('cvImgBtn')} type="primary" icon="select" size="small">选择</Button>
+                {!coverUrl? null :
+                  <Card
+                    hoverable
+                    bordered
+                    cover={<img alt="" src={coverUrl.startsWith('http') ? coverUrl : `${ossHost}/${coverUrl}`} />}
+                    style={{ width: 240, marginTop: 20 }}
+                  >
+                  </Card>}
+              </FormItem>
+              <FormItem label="图片列表" {...formItemLayout}>
                 <Button onClick={() => this.handleModalShow('imgBtn')} type="primary" size="small" icon="edit">编辑</Button>
               </FormItem>
               <FormItem wrapperCol={{ offset: 7, span: 12 }}>
@@ -350,7 +367,7 @@ export default class SupportDetail extends PureComponent {
                     emptyText: <span style={{ color: "#C6D0D6" }}>&nbsp;&nbsp;<Icon type="frown-o"/>
                       该配套下不包含任何图片，请选择!</span>
                   }}
-                  dataSource={imgList}
+                  dataSource={imgList || []}
                   columns={imgTableColumns}
                   rowKey={record => record.id}
                   bordered
@@ -366,7 +383,7 @@ export default class SupportDetail extends PureComponent {
                     emptyText: <span style={{ color: "#C6D0D6" }}>&nbsp;&nbsp;<Icon type="frown-o"/>
                       暂无与该配套相关的配套，请选择!</span>
                   }}
-                  dataSource={supportList}
+                  dataSource={supportList || []}
                   columns={supportTableColumns}
                   rowKey={record => record.id}
                   bordered
@@ -387,7 +404,7 @@ export default class SupportDetail extends PureComponent {
               onCancel={this.handleModalCancel}
               onOk={this.handleModalOk}
               onSearch={this.handleModalSearch}
-              selTableData={supportList}
+              selTableData={supportList || []}
               fsTableDataSource={support.list || []}
               fsTableLoading={support.listLoading}
               fsTablePagination={support.pagination}
@@ -395,6 +412,7 @@ export default class SupportDetail extends PureComponent {
             />
             {/*图片资源的模态选择框*/}
             <ResourceSelectModal
+              mode={curClickedBtn == 'imgBtn' ? 'multiple' : 'single'}
               rowKeyName="id"
               modalVisible={resourceModalVisible}
               style={{ top: 20 }}
@@ -402,7 +420,7 @@ export default class SupportDetail extends PureComponent {
               onOk={this.handleModalOk}
               onCancel={this.handleModalCancel}
               onSearch={this.handleModalSearch}
-              selTableData={imgList}
+              selTableData={imgList || []}
               fsTableDataSource={resource.list || []}
               fsTableLoading={resource.listLoading}
               fsTablePagination={resource.pagination}

src/routes/Support/Edit/resourceModal.js

@@ -2,8 +2,8 @@ import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
 import { Badge, Popover, Icon } from 'antd';
 import SelectModal from '../../../components/SelectModal';
-import styles from './resourceModal.less';
-import { Codes } from '../../../utils/config';
+import styles from './resource.less';
+import { Codes, ossHost } from '../../../utils/config';
 
 export default class ResourceSelectModal extends PureComponent {
   static propTypes = {
@@ -12,7 +12,7 @@ export default class ResourceSelectModal extends PureComponent {
   };
 
   render() {
-    const { selTableData, modalVisible, onCancel, onOk, onSearch, ...fsTableOpts } = this.props;
+    const { mode, selTableData, modalVisible, onCancel, onOk, onSearch, ...fsTableOpts } = this.props;
 
     const modalProps = {
       title: '选择图片',
@@ -33,7 +33,7 @@ export default class ResourceSelectModal extends PureComponent {
         value: 'code', name: '图片编号', mode: 'input',
       }],
       searchSelectProps: {
-        defaultValue: 'name',
+        defaultValue: 'code',
       },
       onSearch: (value) => {
         onSearch(value);
@@ -52,10 +52,10 @@ export default class ResourceSelectModal extends PureComponent {
         key: 'url',
         render: (text, record) => (
           <Popover
-            content={<img alt="" src={record.url} width={350} />}
+            content={<img alt="" src={`${ossHost}/${record.path}`} width={350} />}
             title={record.name}
           >
-            <img alt="" src={record.url} width={70} />
+            <img alt="" src={`${ossHost}/${record.path}`} width={70} />
           </Popover>
         ),
       },{
@@ -78,10 +78,10 @@ export default class ResourceSelectModal extends PureComponent {
         key: 'url',
         render: (text, record) => (
           <Popover
-            content={<img alt="" src={record.url} width={350} />}
+            content={<img alt="" src={`${ossHost}/${record.path}`} width={350} />}
             title={record.name}
           >
-            <img alt="" src={record.url} width={70} />
+            <img alt="" src={`${ossHost}/${record.path}`} width={70} />
           </Popover>
         ),
       },{
@@ -98,7 +98,7 @@ export default class ResourceSelectModal extends PureComponent {
 
     return (
       <SelectModal
-        mode="multiple"
+        mode={mode}
         { ...searchProps }
         { ...selTableProps}
         { ...fsTableProps }

src/routes/Support/Edit/supportModal.js

@@ -2,7 +2,7 @@ import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
 import { Badge, Popover, Icon } from 'antd';
 import SelectModal from '../../../components/SelectModal';
-import styles from './supportModal.less';
+import styles from './support.less';
 import { Codes } from '../../../utils/config';
 
 export default class SupportSelectSortModal extends PureComponent {
@@ -16,7 +16,7 @@ export default class SupportSelectSortModal extends PureComponent {
     const { selTableData, modalVisible, rowKeyName, onCancel, onOk, onSearch, ...fsTableOpts } = this.props;
 
     const modalProps = {
-      title: '选则相关配套',
+      title: '选则配套',
       maskClosable: false,
       visible: modalVisible,
       onCancel,
@@ -34,7 +34,7 @@ export default class SupportSelectSortModal extends PureComponent {
         value: 'code', name: '配套编号', mode: 'input',
       }],
       searchSelectProps: {
-        defaultValue: 'name',
+        defaultValue: 'code',
       },
       onSearch: (value) => {
         onSearch(value);

src/routes/Tag/Edit/index.js

@@ -94,7 +94,7 @@ export default class TagDetail extends PureComponent {
 
   handlePageCancel = () => {
     const { dispatch, tagDetail: { filters } } = this.props;
-    dispatch({ type: 'tagDetail/clearPage' });
+    dispatch({ type: 'tagDetail/initState' });
     dispatch(
       routerRedux.push({
         pathname: '/tag/tagItem',
@@ -182,7 +182,7 @@ export default class TagDetail extends PureComponent {
                     optionFilterProp="children"
                     filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
                   >
-                    {list.map(item => <Select.Option value={item.id} key={item.id}>{`${item.code}/${item.name}`}</Select.Option>)}
+                    {list.map(item => <Select.Option value={item.id} key={item.id}>{`${item.merchantName}/${item.name}/${item.code}`}</Select.Option>)}
                   </Select>
                 )}
               </Form.Item>

src/routes/Tag/List/index.js

@@ -26,7 +26,6 @@ export default class Tag extends PureComponent {
       type: 'merchant/query',
       payload: {
         pageNo: 1,
-        status: Codes.CODE_NORMAL,
         pageSize: 20,
         domain: Codes.CODE_PJ,
       }
@@ -59,7 +58,6 @@ export default class Tag extends PureComponent {
             type: 'merchant/query',
             payload: {
               name: value,
-              status: Codes.CODE_NORMAL
             }
           });
         },

src/routes/Tag/List/search.js

@@ -24,8 +24,6 @@ export default class Search extends PureComponent {
       select: true,
       selectOptions: [{
         value: 'name', name: '标签名称', mode: 'input',
-      },{
-        value: 'code', name: '标签编号', mode: 'input',
       }],
       selectProps: {
         defaultValue: field || 'name',

src/routes/Tag/List/table.js

@@ -17,7 +17,7 @@ export default class TableList extends PureComponent {
       onOk () {
         if (record.status === Codes.CODE_NORMAL) {
           onDeleteItem({id: record.id});
-        } else if (record.status === Codes.CODE_DELETE) {
+        } else {
           onRecoverItem({ id: record.id, status: Codes.CODE_NORMAL });
         }
       },
@@ -40,7 +40,7 @@ export default class TableList extends PureComponent {
       dataIndex: 'groupName',
       key: 'groupName',
     },{
-      title: '渠道平台',
+      title: '渠道名称',
       dataIndex: 'merchantId',
       key: 'merchantId',
       render: (text, record) => record.merchantName,

src/routes/Terminal/Edit/index.js

@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import { Card, Form, Input, Select, Switch, Tooltip, Button, message } from 'antd';
+import { Card, Form, List, Input, Select, Switch, Tooltip, Button, message } from 'antd';
 import { routerRedux } from 'dva/router';
 import { connect } from 'dva';
 import queryString from 'query-string';
@@ -89,7 +89,7 @@ export default class TerminalProfile extends Component {
   render() {
     const { form, terminalDetail, campus } = this.props;
     const { currentItem, modalShow, operType } = terminalDetail;
-    const { name, password, status, campusId, campusName, campusCode } = currentItem;
+    const { name, code, password, status, campusId, campusName, campusCode, merchantName } = currentItem;
     const { getFieldDecorator } = form;
 
     const formItemLayout = {
@@ -120,7 +120,19 @@ export default class TerminalProfile extends Component {
               <Tooltip placement="top" title="点击选择校区">
                 <Button disabled={operType === "update" ? true: false} style={{ marginRight: 20 }} type="primary" size="small" icon="select" onClick={this.handleCampusSelectClick}>选择</Button>
               </Tooltip>
-              {campusName && <strong>{`${campusName}`}</strong>}
+              {code ?
+                <List
+                  size="small"
+                  bordered
+                  dataSource={[
+                    `终端编号: ${code}`,
+                    `终端名称: ${name}`,
+                    `所属校区: ${campusName}`,
+                    `所属渠道: ${merchantName}`,
+                  ]}
+                  renderItem={item => <List.Item>{item}</List.Item>}
+                />
+              : null}
             </Form.Item>
             <Form.Item label="终端名称：" hasFeedback {...formItemLayout}>
               {getFieldDecorator('name', {

src/routes/Terminal/List/search.js

@@ -19,12 +19,10 @@ export default class TerminalSearch extends Component {
       size: 'default',
       select: true,
       selectOptions: [{
-        value: 'name', name: '终端名称', type: 'input',
-      },{
         value: 'code', name: '终端编号', type: 'input',
       }],
       selectProps: {
-        defaultValue: field || 'name',
+        defaultValue: field || 'code',
       },
       onSearch: (value) => {
         onSearch(value);

src/routes/Ware/Edit/index.js

@@ -6,7 +6,7 @@ import { connect } from 'dva';
 import { Spin, Popover, Badge, Table, Radio, Card, Form, Input, Icon, Button, Select } from 'antd';
 import PageHeaderLayout from '../../../layouts/PageHeaderLayout';
 import ResourceSelectSortModal from './modal';
-import { Codes, resourceType, pageSize } from '../../../utils/config';
+import { Codes, ossHost, resourceType, pageSize } from '../../../utils/config';
 
 const FormItem = Form.Item;
 const Option = Select.Option;
@@ -144,7 +144,7 @@ export default class WareDetail extends PureComponent {
         callback: () => {
           dispatch(
             routerRedux.push({
-              pathname: '/product/ware',
+              pathname: '/basic-product/ware',
               search: queryString.stringify(filters),
             })
           );
@@ -159,7 +159,7 @@ export default class WareDetail extends PureComponent {
     dispatch({ type: 'wareDetail/initState' });
     dispatch(
       routerRedux.push({
-        pathname: '/product/ware',
+        pathname: '/basic-product/ware',
         search: queryString.stringify(filters),
       })
     );
@@ -186,10 +186,10 @@ export default class WareDetail extends PureComponent {
       render: (text, record) => (
         record.type !== Codes.CODE_IMAGE ? <Icon type="video-camera" style={{ fontSize: 40}} /> :
           <Popover
-            content={<img alt="" src={record.url} width={350} />}
+            content={<img alt="" src={`${ossHost}/${record.path}`} width={350} />}
             title={record.name}
           >
-            <img alt="" src={record.url} width={70} />
+            <img alt="" src={`${ossHost}/${record.path}`} width={70} />
           </Popover>
       ),
     },{

src/routes/Ware/Edit/modal.js

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { Badge, Popover, Icon } from 'antd';
 import SelectModal from '../../../components/SelectModal';
 import styles from './modal.less';
-import { Codes, resourceType } from '../../../utils/config';
+import { Codes, resourceType, ossHost } from '../../../utils/config';
 
 export default class ResourceSelectSortModal extends PureComponent {
   static propTypes = {
@@ -67,10 +67,10 @@ export default class ResourceSelectSortModal extends PureComponent {
             <Icon type="video-camera" style={{ fontSize: 40}} />
           :
             <Popover
-              content={<img alt="" src={record.url} width={250} />}
+              content={<img alt="" src={`${ossHost}/${record.path}`} width={250} />}
               title={record.name}
             >
-              <img alt="" src={record.url} width={70} />
+              <img alt="" src={`${ossHost}/${record.path}`} width={70} />
             </Popover>
         ),
       },{
@@ -101,11 +101,11 @@ export default class ResourceSelectSortModal extends PureComponent {
             <Icon type="video-camera" style={{ fontSize: 40}} />
           :
             <Popover
-              content={<img alt="" src={record.url} width={250} />}
+              content={<img alt="" src={`${ossHost}/${record.path}`} width={250} />}
               title={record.name}
               placement="top"
             >
-              <img alt="" src={record.url} width={70} />
+              <img alt="" src={`${ossHost}/${record.path}`} width={70} />
             </Popover>
         ),
       },{

src/routes/Ware/List/index.js

@@ -53,7 +53,7 @@ export default class Ware extends PureComponent {
       onAdd: () => {
         dispatch(
           routerRedux.push({
-            pathname: '/product/ware/add',
+            pathname: '/basic-product/ware/add',
             state: filters,
           })
         );
@@ -88,7 +88,7 @@ export default class Ware extends PureComponent {
       onEditItem: (item) => {
         dispatch(
           routerRedux.push({
-            pathname: `/product/ware/edit/${item.id}`,
+            pathname: `/basic-product/ware/edit/${item.id}`,
             state: filters,
           })
         );

src/utils/config.js

@@ -31,6 +31,7 @@ Codes.CODE_ITEM = '件';
 
 module.exports = {
   apiHost: 'http://tt-cms.api.ai160.com',
+  ossHost: 'http://efunimgs.oss-cn-beijing.aliyuncs.com',
   // apiHost: '/api',
   // 每页返回数据量
   pageSize: 10,

src/utils/request.js

@@ -56,16 +56,10 @@ function apiErrorHandler(data) {
   if (!data.success) {
     const errortext = customCodeMessage[data.code] || data.message;
     // 登录密码错误
-    if (data.code === 10002) {
+    if (data.code == 10002) {
       message.error(errortext);
     // Token失效，跳转到登录界面
-    } else if (data.code === 10003) {
-      message.error('认证失效,请重新登录!');
-      const { dispatch } = store;
-      dispatch(routerRedux.push('/user/login'));
-    // Token认证失败, 跳转到登录界面
-    } else if (data.code === 10004) {
-      message.error('认证失败,请重新登录!');
+  } else if (data.code == 10003 || data.code == 10004) {
       const { dispatch } = store;
       dispatch(routerRedux.push('/user/login'));
     // 其它错误打出错误代码