From 45cbcef58ff6f45ce8638540b7a2ee35bd78e9f2 Mon Sep 17 00:00:00 2001
From: wyj2080 <1603068044@qq.com>
Date: Wed, 8 Apr 2020 15:15:13 +0800
Subject: [PATCH 1/3] i-col

---
 kiisoo-ic-ui/src/iview.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kiisoo-ic-ui/src/iview.js b/kiisoo-ic-ui/src/iview.js
index 751353f..341e221 100644
--- a/kiisoo-ic-ui/src/iview.js
+++ b/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);

From a3c2ec309bd2d31526cb82edbef1a8adea66dbdb Mon Sep 17 00:00:00 2001
From: kevin jiang <kevin.jiang@kiisoo.com>
Date: Wed, 8 Apr 2020 15:33:44 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B92=E7=BA=A7=E8=B7=AF?=
 =?UTF-8?q?=E7=94=B1=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kiisoo-ic-ui/src/pages/Home.vue  |  4 +++-
 kiisoo-ic-ui/src/router/index.js | 10 +++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/kiisoo-ic-ui/src/pages/Home.vue b/kiisoo-ic-ui/src/pages/Home.vue
index 075e8d3..3e02fab 100644
--- a/kiisoo-ic-ui/src/pages/Home.vue
+++ b/kiisoo-ic-ui/src/pages/Home.vue
@@ -46,7 +46,9 @@
             <BreadcrumbItem>Components</BreadcrumbItem>
           </Breadcrumb>
           <Card>
-            <div :style="{'height':mHeight + 'px'}">Content</div>
+            <div :style="{'height':mHeight + 'px'}">
+              <router-view/>
+            </div>
           </Card>
         </Content>
       </Layout>
diff --git a/kiisoo-ic-ui/src/router/index.js b/kiisoo-ic-ui/src/router/index.js
index 3764265..6c24332 100755
--- a/kiisoo-ic-ui/src/router/index.js
+++ b/kiisoo-ic-ui/src/router/index.js
@@ -46,13 +46,13 @@ const router = new Router({
           path: '/shop/increase',
           name: 'ShopIncrease',
           component: ShopIncrease
+        },
+        {
+          path: '/customer/data',
+          name: 'CustomerData',
+          component: CustomerData,
         }
       ]
-    },
-    {
-      path: '/customer/data',
-      name: 'CustomerData',
-      component: CustomerData,
     }
   ]
 });

From 5acb17ce36a51f609a1d4cde88b76c350fe7b3fd Mon Sep 17 00:00:00 2001
From: jiangyunjie <woainiduoduo999@163.com>
Date: Wed, 8 Apr 2020 15:58:57 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kiisoo-ic-ui/src/pages/Home.vue  |  11 +++++++++++
 kiisoo-ic-ui/static/img/role.png | Bin 0 -> 283 bytes
 2 files changed, 11 insertions(+)
 create mode 100644 kiisoo-ic-ui/static/img/role.png

diff --git a/kiisoo-ic-ui/src/pages/Home.vue b/kiisoo-ic-ui/src/pages/Home.vue
index 3e02fab..9404822 100644
--- a/kiisoo-ic-ui/src/pages/Home.vue
+++ b/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>
@@ -84,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;
       }
     },
diff --git a/kiisoo-ic-ui/static/img/role.png b/kiisoo-ic-ui/static/img/role.png
new file mode 100644
index 0000000000000000000000000000000000000000..14c52dc6b81dda9a0cfcd7f395281e4b6c3ac1bf
GIT binary patch
literal 283
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&k#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6->JzX3_G=h^;9GE`+{LU&7IpejYgrv{`rvH*+HZP`Xvus}2!0FY@sH|OV
z7f{GJL6hN_!#1ani+?6~YB*eEFcC~LGD=9{XxMasA(UD9M#>(ByKSriVoVD<7iKV2
zf3QEyqVb*C<Kut(dg+BVpBUUW7#SE_8yNfzPe@64^8bJTL#4y__p{6Sh5TU%WxA*k
zUvs~4V&hKv6UGePNe%zm8)k{yy_p<;U`4>E6>=Jv7$zz(H2h0u5}J|N&&?3bAZ(b}
d&%ndPFlCyN#9~9P9H567JYD@<);T3K0RS{_VGIBO

literal 0
HcmV?d00001