refactor:update element-ui

This commit is contained in:
Pan 2017-11-01 11:26:57 +08:00
parent fe31c88193
commit e8b34bbc0d
9 changed files with 28 additions and 38 deletions

View File

@ -18,7 +18,7 @@
"codemirror": "5.31.0",
"dropzone": "5.2.0",
"echarts": "3.7.2",
"element-ui": "2.0.1",
"element-ui": "2.0.2",
"file-saver": "1.3.3",
"font-awesome": "4.7.0",
"js-cookie": "2.2.0",

View File

@ -1,25 +1,18 @@
<template>
<div class="upload-container">
<el-button icon='upload' :style="{background:color,borderColor:color}" @click=" dialogVisible=true" type="primary">上传图片
</el-button>
<el-dialog v-model="dialogVisible">
<el-upload
class="editor-slide-upload"
action="https://httpbin.org/post"
:multiple="true"
:file-list="fileList"
:show-file-list="true"
list-type="picture-card"
:on-remove="handleRemove"
:on-success="handleSuccess"
:before-upload="beforeUpload">
<el-button size="small" type="primary">点击上传</el-button>
</el-upload>
<el-button @click="dialogVisible = false"> </el-button>
<el-button type="primary" @click="handleSubmit"> </el-button>
</el-dialog>
</div>
<div class="upload-container">
<el-button icon='upload' :style="{background:color,borderColor:color}" @click=" dialogVisible=true" type="primary">上传图片
</el-button>
<el-dialog :visible.sync="dialogVisible">
<el-upload class="editor-slide-upload" action="https://httpbin.org/post" :multiple="true" :file-list="fileList" :show-file-list="true"
list-type="picture-card" :on-remove="handleRemove" :on-success="handleSuccess" :before-upload="beforeUpload">
<el-button size="small" type="primary">点击上传</el-button>
</el-upload>
<el-button @click="dialogVisible = false"> </el-button>
<el-button type="primary" @click="handleSubmit"> </el-button>
</el-dialog>
</div>
</template>
<script>
// import { getToken } from 'api/qiniu'

View File

@ -20,7 +20,7 @@
<img :src="errGif" width="313" height="428" alt="Girl has dropped her ice cream.">
</el-col>
</el-row>
<el-dialog title="随便看" :visible.sync="dialogVisible" size="large">
<el-dialog title="随便看" :visible.sync="dialogVisible">
<img class="pan-img" :src="ewizardClap">
</el-dialog>
</div>

View File

@ -74,7 +74,7 @@ export default {
statusFilter(status) {
const statusMap = {
published: 'success',
draft: 'gray',
draft: 'info',
deleted: 'danger'
}
return statusMap[status]

View File

@ -1,6 +1,6 @@
<template>
<div class="tab-container">
<el-tag type="primary">mounted times {{createdTimes}}</el-tag>
<el-tag>mounted times {{createdTimes}}</el-tag>
<el-tabs style='margin-top:15px;' v-model="activeName" type="border-card">
<el-tab-pane v-for="item in tabMapOptions" :label="item.label" :key='item.key' :name="item.key">
<keep-alive>

View File

@ -136,7 +136,7 @@
</div>
</el-dialog>
<el-dialog title="阅读数统计" :visible.sync="dialogPvVisible" size="small">
<el-dialog title="阅读数统计" :visible.sync="dialogPvVisible">
<el-table :data="pvData" border fit highlight-current-row style="width: 100%">
<el-table-column prop="key" label="渠道"> </el-table-column>
<el-table-column prop="pv" label="pv"> </el-table-column>
@ -214,7 +214,7 @@ export default {
statusFilter(status) {
const statusMap = {
published: 'success',
draft: 'gray',
draft: 'info',
deleted: 'danger'
}
return statusMap[status]

View File

@ -83,7 +83,7 @@ export default {
statusFilter(status) {
const statusMap = {
published: 'success',
draft: 'gray',
draft: 'info',
deleted: 'danger'
}
return statusMap[status]

View File

@ -69,7 +69,7 @@ export default {
statusFilter(status) {
const statusMap = {
published: 'success',
draft: 'gray',
draft: 'info',
deleted: 'danger'
}
return statusMap[status]

View File

@ -7,8 +7,7 @@
</div>
<div class="box-item">
<span class="field-label">换肤:</span>
<el-switch v-model="theme" on-text="" off-text="">
</el-switch>
<el-switch v-model="theme"></el-switch>
</div>
</el-card>
@ -19,7 +18,7 @@
<el-button type="warning">警告按钮</el-button>
<el-button type="danger">危险按钮</el-button>
<el-button type="info">信息按钮</el-button>
</span>
</span>
</div>
<div class="block">
@ -42,7 +41,6 @@
</div>
</template>
<script>
import { toggleClass } from '@/utils'
// import '@/assets/custom-theme/index.css' // element-ui css
@ -53,12 +51,11 @@ export default {
return {
theme: false,
tags: [
{ name: '标签一', type: '' },
{ name: '标签二', type: 'gray' },
{ name: '标签三', type: 'primary' },
{ name: '标签四', type: 'success' },
{ name: '标签五', type: 'warning' },
{ name: '标签六', type: 'danger' }
{ name: 'Tag One', type: '' },
{ name: 'Tag Two', type: 'info' },
{ name: 'Tag Three', type: 'success' },
{ name: 'Tag Four', type: 'warning' },
{ name: 'Tag Five', type: 'danger' }
]
}
},