From 709c2c7ad47788a4ceaf994292615e922c2586b8 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Fri, 20 Jul 2018 09:42:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 0dae4025650c4a1bcea808718be70a31782196bd [formerly 0dae4025650c4a1bcea808718be70a31782196bd [formerly 0dae4025650c4a1bcea808718be70a31782196bd [formerly 0dae4025650c4a1bcea808718be70a31782196bd [formerly a053d8bbe89715c1107ca7193e0b31440676017e [formerly 82dd2bf34c8623036fda84ef40f46ea631099515]]]]]
Former-commit-id: c43653e2b7d1f04f7ea201e5d8baf97ade60ff21
Former-commit-id: 2f956fb4f893c38d201a9d0d8dc670bdc2df337d
Former-commit-id: 116d191630ecad7c57d03648222f9a6f317d21fb [formerly f18aea707b7a595dd3de3e5e1a586241bef799c9]
Former-commit-id: c532373169ed90b86a17f590e490740319488844
Former-commit-id: 29ddea1b33dee0a9f1d82643c830b9c35998ceed
Former-commit-id: 6446520aab7685d5c8cad31e5b488750ab18368d
Former-commit-id: d573fc373c37db24118cb6fd700b175ecf9b97b0
Former-commit-id: 962314d48687b8abb85821eea1ebeb370d98914e
---
 package.json                                  |  1 +
 .../components/header-user/index.vue          |  1 -
 src/pages/demo/element/data-table/index.vue   | 52 +++++++++++++++++--
 src/store/modules/d2admin.js.REMOVED.git-id   |  2 +-
 4 files changed, 51 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 2441a19f..935a63de 100644
--- a/package.json
+++ b/package.json
@@ -5,6 +5,7 @@
   "scripts": {
     "serve": "vue-cli-service serve --open",
     "start": "vue-cli-service serve --open",
+    "dev": "vue-cli-service serve --open",
     "build": "vue-cli-service build",
     "lint": "vue-cli-service lint --fix",
     "test:unit": "vue-cli-service test:unit",
diff --git a/src/layout/header-aside/components/header-user/index.vue b/src/layout/header-aside/components/header-user/index.vue
index 37d17d0e..89e145ea 100644
--- a/src/layout/header-aside/components/header-user/index.vue
+++ b/src/layout/header-aside/components/header-user/index.vue
@@ -3,7 +3,6 @@
     <span class="btn-text">你好 {{userInfo.name}}</span>
     <el-dropdown-menu slot="dropdown">
       <el-dropdown-item @click.native="logOff"><d2-icon name="power-off"/> 注销</el-dropdown-item>
-      <el-dropdown-item><d2-icon name="user-circle-o"/> 个人中心</el-dropdown-item>
     </el-dropdown-menu>
   </el-dropdown>
 </template>
diff --git a/src/pages/demo/element/data-table/index.vue b/src/pages/demo/element/data-table/index.vue
index 621a51ca..53f64ad7 100644
--- a/src/pages/demo/element/data-table/index.vue
+++ b/src/pages/demo/element/data-table/index.vue
@@ -1,7 +1,53 @@
 <template>
   <d2-container>
-    <h1 class="d2-mt-0">该页面尚未完成组件示例搬运</h1>
-    <p>D2Admin 的构建依托于由饿了么出品的 ElementUI，欲了解更多该组件的信息请查阅以下链接</p>
-    <d2-link-btn title="Element" link="http://element.eleme.io/#/zh-CN"/>
+    
+    <h1 class="d2-mt-0">基础用法</h1>
+    <el-table
+      :data="tableData"
+      style="width: 100%">
+      <el-table-column
+        prop="date"
+        label="日期"
+        width="180">
+      </el-table-column>
+      <el-table-column
+        prop="name"
+        label="姓名"
+        width="180">
+      </el-table-column>
+      <el-table-column
+        prop="address"
+        label="地址">
+      </el-table-column>
+    </el-table>
+
   </d2-container>
 </template>
+
+<script>
+export default {
+  data () {
+    return {
+      tableData: [
+        {
+          date: '2016-05-02',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1518 弄'
+        }, {
+          date: '2016-05-04',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1517 弄'
+        }, {
+          date: '2016-05-01',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1519 弄'
+        }, {
+          date: '2016-05-03',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1516 弄'
+        }
+      ]
+    }
+  }
+}
+</script>
diff --git a/src/store/modules/d2admin.js.REMOVED.git-id b/src/store/modules/d2admin.js.REMOVED.git-id
index 065090f2..d1abd206 100644
--- a/src/store/modules/d2admin.js.REMOVED.git-id
+++ b/src/store/modules/d2admin.js.REMOVED.git-id
@@ -1 +1 @@
-ba1f2c6d38619c095d25a69254227124c5bc6000
\ No newline at end of file
+5c74482dc6e71d5efa34bc5fdfb5c40943d5d386
\ No newline at end of file