Merge branch 'master' of http://git.ycjcjy.com/estateagents/pc-channel

config/routes.js

@@ -39,30 +39,6 @@ export default [
             hideInMenu: true,
             component: './channel/edit',
           },
-          {
-            path: '/contact',
-            name: '联系人管理',
-            component: '../layouts/BlankLayout',
-            routes: [
-              {
-                path: '/contact/contact/list',
-                name: '联系人',
-                component: './contact/contact/list',
-              },
-              {
-                path: '/contact/contact/add',
-                name: '新增',
-                hideInMenu: true,
-                component: './contact/contact/add',
-              },
-              {
-                path: '/contact/contact/detail',
-                name: '详情',
-                hideInMenu: true,
-                component: './contact/contact/detail',
-              },
-            ],
-          },
           {
             path: '/sample',
             name: 'H5样例管理',
@@ -92,6 +68,30 @@ export default [
               },
             ],
           },
+          {
+            path: '/contact',
+            name: '联系人管理',
+            component: '../layouts/BlankLayout',
+            routes: [
+              {
+                path: '/contact/contact/list',
+                name: '联系人',
+                component: './contact/contact/list',
+              },
+              {
+                path: '/contact/contact/add',
+                name: '新增',
+                hideInMenu: true,
+                component: './contact/contact/add',
+              },
+              {
+                path: '/contact/contact/detail',
+                name: '详情',
+                hideInMenu: true,
+                component: './contact/contact/detail',
+              },
+            ],
+          },
           {
             path: '/resource',
             name: '资源位管理',

src/pages/contact/contact/add.jsx

@@ -188,7 +188,7 @@ const header = props => {
 
     const cancelPage = () => {
         router.push({
-            pathname: '/contact/pathname',
+            pathname: '/contact/contact/list',
         });
     }