From 524fb55a4992301d6afb83686bd4e606e27b6adb Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 17 Jun 2018 21:42:42 +0800
Subject: [PATCH] no message
Former-commit-id: 7e46f409fa33922c33bd4ad0a0c5d654768ebebb [formerly 7e46f409fa33922c33bd4ad0a0c5d654768ebebb [formerly 7e46f409fa33922c33bd4ad0a0c5d654768ebebb [formerly 7e46f409fa33922c33bd4ad0a0c5d654768ebebb [formerly 639bac1eb7272e8fa79619ab271db639cd01f4ab [formerly 3a8f6872690e37750e9d79f242ac7c01573cd936]]]]]
Former-commit-id: 146c61b0ea624506fd2b2ab828424bf6b37e2bd2
Former-commit-id: bf27ab0bd3a124f3a1fb6fc5c0dbffdaedbd6184
Former-commit-id: ef6a06017b9b54324f9432e5680c24c752a8d301 [formerly 362516e7d88d3b1413a9cf6e8afb47daffbb7e5b]
Former-commit-id: f9fa709d029db4d4ad5c31d032e04fb6f3ec1f75
Former-commit-id: 65fa6c6e7966ba50155bca9a5de5d524a623a03d
Former-commit-id: ab97ea314ebfa4dde0b2fed58cfe5586ed39b98a
Former-commit-id: c99315c684744f738b51482b5f1139e5789b5fc9
Former-commit-id: ac3a541857ea308892db57dec0426c581bf286c5
---
src/menu/index.js | 3 +-
src/pages/demo/element/basic-button/index.vue | 41 +++++++++++++++++++
src/pages/demo/element/basic-color/index.vue | 4 ++
.../demo/element/basic-container/index.vue | 8 ++++
src/pages/demo/element/basic-layout/index.vue | 7 ++++
src/router/index.js | 1 +
6 files changed, 63 insertions(+), 1 deletion(-)
create mode 100644 src/pages/demo/element/basic-button/index.vue
diff --git a/src/menu/index.js b/src/menu/index.js
index f1cce48c..42bbecb0 100644
--- a/src/menu/index.js
+++ b/src/menu/index.js
@@ -135,7 +135,8 @@ const demoElement = {
children: [
{ path: `${pre}basic-layout`, title: '布局' },
{ path: `${pre}basic-container`, title: '布局容器' },
- { path: `${pre}basic-color`, title: '颜色' }
+ { path: `${pre}basic-color`, title: '颜色' },
+ { path: `${pre}basic-button`, title: '按钮' }
]
}
])('/demo/element/')
diff --git a/src/pages/demo/element/basic-button/index.vue b/src/pages/demo/element/basic-button/index.vue
new file mode 100644
index 00000000..c635a132
--- /dev/null
+++ b/src/pages/demo/element/basic-button/index.vue
@@ -0,0 +1,41 @@
+
+
+
+
+ 默认按钮
+ 主要按钮
+ 成功按钮
+ 信息按钮
+ 警告按钮
+ 危险按钮
+
+
+
+ 朴素按钮
+ 主要按钮
+ 成功按钮
+ 信息按钮
+ 警告按钮
+ 危险按钮
+
+
+
+ 圆角按钮
+ 主要按钮
+ 成功按钮
+ 信息按钮
+ 警告按钮
+ 危险按钮
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/demo/element/basic-color/index.vue b/src/pages/demo/element/basic-color/index.vue
index 949d913a..15883b83 100644
--- a/src/pages/demo/element/basic-color/index.vue
+++ b/src/pages/demo/element/basic-color/index.vue
@@ -1,5 +1,6 @@
+
主色
@@ -10,6 +11,7 @@
+
辅助色
@@ -35,6 +37,7 @@
+
中性色
@@ -82,6 +85,7 @@
+
diff --git a/src/pages/demo/element/basic-container/index.vue b/src/pages/demo/element/basic-container/index.vue
index e4ebfe69..bd401677 100644
--- a/src/pages/demo/element/basic-container/index.vue
+++ b/src/pages/demo/element/basic-container/index.vue
@@ -1,18 +1,22 @@
+
顶栏
主体
+
顶栏
主体
底栏
+
侧边栏
主体
+
顶栏
@@ -20,6 +24,7 @@
主体
+
顶栏
@@ -30,6 +35,7 @@
+
侧边栏
@@ -37,6 +43,7 @@
主体
+
侧边栏
@@ -45,6 +52,7 @@
底栏
+
diff --git a/src/pages/demo/element/basic-layout/index.vue b/src/pages/demo/element/basic-layout/index.vue
index f53ec7e1..c9bdd31a 100644
--- a/src/pages/demo/element/basic-layout/index.vue
+++ b/src/pages/demo/element/basic-layout/index.vue
@@ -1,5 +1,6 @@
+
基础布局
@@ -29,6 +30,7 @@
+
分栏间隔
@@ -38,6 +40,7 @@
+
混合布局
@@ -56,6 +59,7 @@
+
分栏偏移
@@ -70,6 +74,7 @@
+
对齐方式
@@ -98,6 +103,7 @@
+
响应式布局
@@ -107,6 +113,7 @@
+
diff --git a/src/router/index.js b/src/router/index.js
index a29d89c0..5b53913c 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -111,6 +111,7 @@ const routes = [
{ path: 'basic-layout', name: `${pre}basic-layout`, component: () => import('@/pages/demo/element/basic-layout/index.vue'), meta },
{ path: 'basic-container', name: `${pre}basic-container`, component: () => import('@/pages/demo/element/basic-container/index.vue'), meta },
{ path: 'basic-color', name: `${pre}basic-color`, component: () => import('@/pages/demo/element/basic-color/index.vue'), meta },
+ { path: 'basic-button', name: `${pre}basic-button`, component: () => import('@/pages/demo/element/basic-button/index.vue'), meta },
{ path: 'index', name: `${pre}index`, component: () => import('@/pages/demo/element/index/index.vue'), meta }
])('demo-element-')
},