no message

Former-commit-id: e56d52ae1e817adb053f6d20bad490379bf6b8b7
Former-commit-id: b6641ea988e7dab68cc11ae212c32f32923e1cf3
Former-commit-id: a4e3d1e9d3998e7fb34266719f8d55980078dcfd
This commit is contained in:
liyang
2018-06-10 08:51:27 +08:00
parent 58ec52afac
commit 5e1f4e9a36
23 changed files with 45 additions and 42 deletions

View File

@@ -5,8 +5,8 @@
:content="isFullScreen ? '退出全屏' : '全屏'"
placement="bottom">
<el-button class="d2-mr btn-text" type="text" @click="toggleFullScreen">
<Icon v-if="isFullScreen" name="compress"></Icon>
<Icon v-else name="arrows-alt"></Icon>
<d2-icon v-if="isFullScreen" name="compress"></d2-icon>
<d2-icon v-else name="arrows-alt"></d2-icon>
</el-button>
</el-tooltip>
</template>

View File

@@ -2,8 +2,8 @@
<el-dropdown class="d2-mr">
<span class="el-dropdown-link">你好</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item @click.native="logOff"><Icon name="power-off"></Icon> 注销</el-dropdown-item>
<el-dropdown-item><Icon name="user-circle-o"></Icon> 个人中心</el-dropdown-item>
<el-dropdown-item @click.native="logOff"><d2-icon name="power-off"></d2-icon> 注销</el-dropdown-item>
<el-dropdown-item><d2-icon name="user-circle-o"></d2-icon> 个人中心</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</template>

View File

@@ -7,7 +7,7 @@
<img v-else src="@/assets/image/logo/header.png">
</div>
<div class="toggle-aside-btn" @click="collapse = !collapse">
<Icon name="bars"/>
<d2-icon name="bars"/>
</div>
<HeaderMenu/>
<HeaderRight/>

View File

@@ -61,6 +61,7 @@
<script>
import icon from '@/assets/library/font-awesome-4.7.0-icon/icon.js'
export default {
name: 'd2-icon-select',
props: {
//
value: {

View File

@@ -6,6 +6,7 @@
<script>
export default {
name: 'd2-icon-svg',
props: {
name: {
type: String,

View File

@@ -4,6 +4,7 @@
<script>
export default {
name: 'd2-icon',
props: {
name: {
type: String,

View File

@@ -3,9 +3,9 @@ import Vue from 'vue'
Vue.component('d2-container', resolve => { require(['@/components/core/d2-container'], resolve) })
Vue.component('d2-count-up', resolve => { require(['@/components/core/d2-count-up'], resolve) })
Vue.component('d2-highlight', resolve => { require(['@/components/core/d2-highlight'], resolve) })
Vue.component('Icon', resolve => { require(['@/components/core/Icon'], resolve) })
Vue.component('IconSelect', resolve => { require(['@/components/core/IconSelect/index.vue'], resolve) })
Vue.component('IconSvg', resolve => { require(['@/components/core/IconSvg/index.vue'], resolve) })
Vue.component('d2-icon', resolve => { require(['@/components/core/d2-icon'], resolve) })
Vue.component('d2-icon-select', resolve => { require(['@/components/core/d2-icon-select/index.vue'], resolve) })
Vue.component('d2-icon-svg', resolve => { require(['@/components/core/d2-icon-svg/index.vue'], resolve) })
Vue.component('Markdown', resolve => { require(['@/components/core/Markdown'], resolve) })
Vue.component('QuillEditor', resolve => { require(['@/components/core/QuillEditor'], resolve) })
Vue.component('SimpleMDE', resolve => { require(['@/components/core/SimpleMDE'], resolve) })