许静 5 years ago
parent
commit
32a0175ad6
4 changed files with 16 additions and 24 deletions
  1. 0
    12
      config/config.js
  2. 1
    0
      src/global.less
  3. 13
    10
      src/layouts/BlankLayout.jsx
  4. 2
    2
      src/pages/integralMall/GoodsList.jsx

+ 0
- 12
config/config.js View File

@@ -153,18 +153,6 @@ export default {
153 153
                 },
154 154
               ],
155 155
             },
156
-            {
157
-              path: '/activity',
158
-              name: '活动管理',
159
-              component: '../layouts/BlankLayout',
160
-              routes: [
161
-                {
162
-                  path: '/activity/ActivityList',
163
-                  name: '活动列表',
164
-                  component: './activity/ActivityList',
165
-                },
166
-              ],
167
-            },
168 156
             {
169 157
               component: './404',
170 158
             },

+ 1
- 0
src/global.less View File

@@ -12,6 +12,7 @@ body,
12 12
 
13 13
 .ant-layout {
14 14
   min-height: 100vh;
15
+  background-color: #f8f8f8;
15 16
 }
16 17
 
17 18
 canvas {

+ 13
- 10
src/layouts/BlankLayout.jsx View File

@@ -1,16 +1,19 @@
1 1
 import React from 'react';
2
+import { PageHeaderWrapper } from '@ant-design/pro-layout';
2 3
 
3 4
 const Layout = ({ children }) => (
4
-  <div
5
-    style={{
6
-      backgroundColor: '#fff',
7
-      padding: '32PX 28px',
8
-      boxShadow: '0px 0px 16px 2px rgba(0,0,0,0.12)',
9
-      borderRadius: '12px',
10
-    }}
11
-  >
12
-    {children}
13
-  </div>
5
+  <PageHeaderWrapper style={{height:'49px',background:'rgba(240,240,240,1)',paddingTop:'15px'}}>
6
+    <div
7
+      style={{
8
+        backgroundColor: '#fff',
9
+        padding: '32PX 28px',
10
+        boxShadow: '0px 0px 16px 2px rgba(0,0,0,0.12)',
11
+        borderRadius: '12px',
12
+      }}
13
+    >
14
+      {children}
15
+    </div>
16
+  </PageHeaderWrapper>
14 17
 );
15 18
 
16 19
 export default Layout;

+ 2
- 2
src/pages/integralMall/GoodsList.jsx View File

@@ -1,5 +1,5 @@
1 1
 import React from 'react';
2
-import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal } from 'antd';
2
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal,Breadcrumb } from 'antd';
3 3
 import { FormattedMessage } from 'umi-plugin-react/locale';
4 4
 import styles from '../style/GoodsList.less';
5 5
 import router from 'umi/router';
@@ -103,7 +103,7 @@ const columns = [
103 103
     dataIndex: 'handle',
104 104
     key: 'handle',
105 105
     align: 'center',
106
-    render: () => <><span style={{ color: '#1990FF', marginRight: '20px' }} onClick={confirm}>下架<Icon type="shopping-cart" className={styles.shoppingCart} /></span><span style={{ color: '#FF925C' }}>编辑<Icon type="form" className={styles.edit} /></span></>,
106
+    render: () => <><span style={{ color: '#1990FF', marginRight: '20px' }} onClick={confirm}>下架<Icon type="shopping-cart" className={styles.shoppingCart} /></span><span style={{ color: '#FF925C' }} onClick={toEditGoods}>编辑<Icon type="form" className={styles.edit} /></span></>,
107 107
   },
108 108
 ];
109 109
 function confirm() {