Merge branch 'dev' into 'master'

Dev

See merge request !62

.eslintrc.js

@@ -18,6 +18,9 @@ module.exports = {
     'multiline-ternary': 'off',
     'multiline-ternary': 'off',
     'vue/multi-word-component-names': 'off',
     'vue/multi-word-component-names': 'off',
     'eol-last': 0,
     'eol-last': 0,
+    'node/no-callback-literal': 'off',
+    'no-trailing-spaces': 'off',
+    'no-unused-vars': 'off',
     'vue/no-mutating-props': 'off'
     'vue/no-mutating-props': 'off'
   }
   }
 }
 }

src/router/index.js

@@ -176,6 +176,12 @@ const routes = [
         meta: { title: '异步任务' }
         meta: { title: '异步任务' }
       },
       },
       {
       {
+        path: '/operation/amazonAttributeGrouping',
+        component: () => import('@/views/operation/amazon/amazonAttributeGrouping.vue'),
+        name: 'amazonAttributeGrouping',
+        meta: { title: '亚马逊属性分类' }
+      },
+      {
         path: '/saas/production/assistant/manage',
         path: '/saas/production/assistant/manage',
         component: () => import('@/views/production/AssistantManage.vue'),
         component: () => import('@/views/production/AssistantManage.vue'),
         name: 'production_assistant_manage',
         name: 'production_assistant_manage',

src/views/home/navMenu.vue

@@ -301,6 +301,14 @@ export default {
               icon: 'el-icon-box',
               icon: 'el-icon-box',
               index: '/saas/import-template',
               index: '/saas/import-template',
               children: []
               children: []
+            },
+            {
+              id: 12,
+              path: '',
+              label: '亚马逊属性分类',
+              icon: 'el-icon-s-check',
+              index: '/operation/amazonAttributeGrouping',
+              children: []
             }
             }
             // {
             // {
             //   id: 11,
             //   id: 11,