Merge branch 'master' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager

config/config.js

@@ -151,18 +151,11 @@ export default {
                   name: '渠道管理',
                   component: './channel/channelList',
                 },
-              ],
-            },
-            {
-              path: '/activity',
-              name: '活动管理',
-              component: '../layouts/BlankLayout',
-              routes: [
-                {
-                  path: '/activity/ActivityList',
-                  name: '活动列表',
-                  component: './activity/ActivityList',
-                },
+                // {
+                //   path: '/channel/addChannel',
+                //   name: '新增渠道',
+                //   component: './channel/addChannel',
+                // },
               ],
             },
             {

src/global.less

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

src/layouts/BlankLayout.jsx

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

src/pages/channel/channelList.jsx

@@ -7,6 +7,8 @@ const { Option } = Select;
 function handleChange(value) {
   console.log(`selected ${value}`);
 }
+
+
 const menu = (
   <Menu onClick={handleMenuClick}>
     <Menu.Item key="1">
@@ -92,6 +94,13 @@ const columns = [
     align: 'center',
     render: () => <a>Delete</a>,
   },
+  {
+    title: '操作',
+    dataIndex: 'handle',
+    key: 'handle',
+    align: 'center',
+    render: () => <a style={ { color: '#66B3FF' } }>编辑</a>,
+  },
 ];
 
 export default () => (

src/pages/channel/channelList.less

@@ -44,3 +44,16 @@
   color: rgb(10, 10, 10);
   margin: 30px 0;
 }
+
+.inpuit {
+  width:50%;
+}
+
+.inpuitTxt {
+  width:70%;
+}
+
+
+.formButton{
+  margin-left: 12% 
+}

src/pages/integralMall/GoodsList.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal } from 'antd';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal,Breadcrumb } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import styles from '../style/GoodsList.less';
 import router from 'umi/router';
@@ -103,7 +103,7 @@ const columns = [
     dataIndex: 'handle',
     key: 'handle',
     align: 'center',
-    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></>,
+    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></>,
   },
 ];
 function confirm() {