Merge remote-tracking branch 'origin/feature/20200402_init_dev' into feature/20200402_init_dev

kiisoo-ic-ui/src/iview.js

@@ -38,6 +38,6 @@ Vue.component('Content', Content);
 Vue.component('Breadcrumb', Breadcrumb);
 Vue.component('BreadcrumbItem', BreadcrumbItem);
 Vue.component('Row', Row);
-Vue.component('Col', Col);
+Vue.component('i-col', Col);
 Vue.component('Select', Select);
 Vue.component('Option', Option);

kiisoo-ic-ui/src/pages/Home.vue

@@ -36,6 +36,16 @@
             <MenuItem name="客户数据">客户数据</MenuItem>
 
           </Submenu>
+
+          <Submenu name="4">
+            <template slot="title">
+              <Icon type="ios-paper" />
+              设置管理
+            </template>
+            <MenuItem name="账户管理">账户管理</MenuItem>
+            <MenuItem name="角色管理">角色管理</MenuItem>
+
+          </Submenu>
         </Menu>
       </Sider>
       <Layout>
@@ -46,7 +56,9 @@
             <BreadcrumbItem>Components</BreadcrumbItem>
           </Breadcrumb>
           <Card>
-            <div :style="{'height':mHeight + 'px'}">Content</div>
+            <div :style="{'height':mHeight + 'px'}">
+              <router-view/>
+            </div>
           </Card>
         </Content>
       </Layout>
@@ -82,6 +94,7 @@ export default {
     onSelectLister (val) {
       switch (val) {
         case "客户数据":this.$router.push("/customer/data");break;
+        case "角色管理":this.$router.push('/role/manager');break;
         default:break;
       }
     },

kiisoo-ic-ui/src/router/index.js

@@ -46,8 +46,6 @@ const router = new Router({
           path: '/shop/increase',
           name: 'ShopIncrease',
           component: ShopIncrease
-        }
-      ]
         },
         {
           path: '/customer/data',
@@ -55,6 +53,8 @@ const router = new Router({
           component: CustomerData,
         }
       ]
+    }
+  ]
 });
 /*
 * 跳转前的处理事件