Merge branch 'test'

This commit is contained in:
zyy 2019-08-27 09:47:05 +08:00
commit 5fd2efcb75

View File

@ -1,6 +1,6 @@
<template> <template>
<div class="avatar-container" style="right: 80px;"> <div class="avatar-container" style="right: 80px;">
<el-menu-item v-for="item in entryList" :key="item.name" class="avatar-wrapper" index="" @click="item.handle"> <el-menu-item v-for="item in entryList" v-show="!item.hidden" :key="item.name" class="avatar-wrapper" index="" @click="item.handle">
<span style="color: white;">{{ $t(item.name) }}</span> <span style="color: white;">{{ $t(item.name) }}</span>
</el-menu-item> </el-menu-item>
<deomon-list ref="deomonList" /> <deomon-list ref="deomonList" />
@ -27,7 +27,8 @@ export default {
}, },
{ {
name: 'global.scan', name: 'global.scan',
handle: this.qcodeEntry handle: this.qcodeEntry,
hidden: process.env.NODE_ENV != 'development'
} }
], ],
stomp: null, stomp: null,