Commit 77e68b27 by caoyanzhi

调整

parent a114186d
......@@ -119,27 +119,25 @@
<!-- excel导入 -->
<el-dialog :title="importPop.title" :visible.sync="importPop.isShow" width="600px" custom-class="manual-dialog">
<div class="import">
<div class="excel-icon">
<svg v-show="importPop.excelData.length > 0" aria-hidden="true" width="40px" height="40px">
<use xlink:href="#icon-excel"></use>
</svg>
<svg v-show="importPop.excelData.length === 0" aria-hidden="true" width="40px" height="40px">
<use xlink:href="#icon-tianjia"></use>
</svg>
<div :class="['excel-icon', importPop.excelData.length > 0 ? 'excel-icon--active' : 'excel-icon--add']" @click="handleUpload">
<span v-show="importPop.excelData.length === 0" class="import-btn">点击上传会员</span>
</div>
<div class="import-cont">
<div class="import-handle">
<input type="file" style="display: none" accept=".xlsx, .xls, .csv" ref="upload" @change="handleFileChange">
<span v-if="importPop.excelData.length === 0" class="import-btn" @click="handleUpload">点击上传会员</span>
<template v-if="importPop.excelData.length > 0">
<span>{{importPop.excelName}}</span>
<span class="import-num">已导入会员 {{importPop.excelData.length}}</span>
<el-button type="text" @click="handleUpload">重新导入</el-button>
<span class="import-num">
已导入会员
<span class="color-303133">{{importPop.excelData.length}}</span>
</span>
<el-button type="text" @click="reHandleUpload">重新导入</el-button>
</template>
</div>
<div class="import-tip">
只能上传一个excle文件(2003版本以上),且数据不超过5000条
<el-button type="text" @click="downloadExcelTemp">下载Excel模板</el-button>
<span class="import-tip-text">只能上传一个excle文件(2003版本以上),且数据不超过5000条</span>
<el-button type="text" class="font-12" @click="downloadExcelTemp">下载Excel模板</el-button>
</div>
<div class="clear-old">
<el-checkbox v-model="importPop.optType">清空标签历史标记会员</el-checkbox>
......@@ -475,8 +473,13 @@ export default {
this.importPop.optType = false;
},
// 点击上传文件、重新导入按钮
// 点击上传文件、
handleUpload() {
if (this.importPop.excelData.length !== 0) return;
this.reHandleUpload();
},
// 重新导入按钮
reHandleUpload() {
this.$refs.upload.click();
},
......@@ -865,30 +868,39 @@ export default {
.excel-icon {
margin-right: 10px;
width: 40px;
height: 40px;
color: #606266;
background-repeat: no-repeat;
background-size: 100%;
background-position: center;
.import-btn {
display: block;
width: 100px;
transform: translate(50px, 4px);
}
}
.excel-icon--add {
cursor: pointer;
background-image: url('../../../static/img/add.svg');
&:hover {
color: #1890FF;
background-image: url("../../../static/img/add-hover.svg");
}
}
.excel-icon--active {
background-image: url('../../../static/img/excel.svg');
}
.import-cont {
padding-top: 5px;
width: 500px;
.import-handle {
display: flex;
align-items: center;
height: 22px;
font-size: 14px;
color: #606266;
.import-btn {
display: inline-block;
max-width: 200px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
cursor: pointer;
&:hover {
color: #1890FF;
}
}
.import-num {
margin-left: 24px;
padding-right: 15px;
......@@ -901,6 +913,11 @@ export default {
.import-tip {
font-size: 12px;
color: #909399;
.import-tip-text {
margin-right: 10px;
padding-right: 15px;
border-right: 1px solid #DCDFE6;
}
}
.clear-old {
......
<?xml version="1.0" encoding="UTF-8"?>
<svg width="40px" height="40px" viewBox="0 0 40 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 52.4 (67378) - http://www.bohemiancoding.com/sketch -->
<title>添加 加号 无边框</title>
<desc>Created with Sketch.</desc>
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="新增手工标签-copy-10" transform="translate(-419.000000, -522.000000)">
<g id="Dialog-对话框/表单" transform="translate(395.000000, 435.000000)">
<g id="添加-加号-无边框" transform="translate(24.000000, 87.000000)">
<rect id="矩形" fill="#E9F4FF" x="0" y="0" width="40" height="40" rx="4"></rect>
<path d="M26.5,20 L21,20 L21,14.5 C21,14.22 20.78,14 20.5,14 C20.22,14 20,14.22 20,14.5 L20,20 L14.5,20 C14.22,20 14,20.22 14,20.5 C14,20.78 14.22,21 14.5,21 L20,21 L20,26.5 C20,26.78 20.22,27 20.5,27 C20.78,27 21,26.78 21,26.5 L21,21 L26.5,21 C26.78,21 27,20.78 27,20.5 C27,20.22 26.78,20 26.5,20 Z" id="路径" fill="#1890FF"></path>
</g>
</g>
</g>
</g>
</svg>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<svg width="40px" height="40px" viewBox="0 0 40 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 52.4 (67378) - http://www.bohemiancoding.com/sketch -->
<title>添加 加号 无边框</title>
<desc>Created with Sketch.</desc>
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="新增手工标签-copy-2" transform="translate(-419.000000, -522.000000)">
<g id="Dialog-对话框/表单" transform="translate(395.000000, 435.000000)">
<g id="添加-加号-无边框" transform="translate(24.000000, 87.000000)">
<rect id="矩形" fill="#F3F6F9" x="0" y="0" width="40" height="40" rx="4"></rect>
<path d="M26.5,20 L21,20 L21,14.5 C21,14.22 20.78,14 20.5,14 C20.22,14 20,14.22 20,14.5 L20,20 L14.5,20 C14.22,20 14,20.22 14,20.5 C14,20.78 14.22,21 14.5,21 L20,21 L20,26.5 C20,26.78 20.22,27 20.5,27 C20.78,27 21,26.78 21,26.5 L21,21 L26.5,21 C26.78,21 27,20.78 27,20.5 C27,20.22 26.78,20 26.5,20 Z" id="路径" fill="#C0C4CC"></path>
</g>
</g>
</g>
</g>
</svg>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<svg width="40px" height="40px" viewBox="0 0 40 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 52.4 (67378) - http://www.bohemiancoding.com/sketch -->
<title>excel-01</title>
<desc>Created with Sketch.</desc>
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="新增手工标签-copy-5" transform="translate(-419.000000, -552.000000)">
<g id="Dialog-对话框/表单" transform="translate(395.000000, 465.000000)">
<g id="excel-01" transform="translate(24.000000, 87.000000)">
<rect id="矩形" fill="#F3F6F9" x="0" y="0" width="40" height="40" rx="4"></rect>
<path d="M23.1612903,5 L6,8.43821741 L6,33.174126 L23.1612903,36.6129032 L23.1612903,5 Z M14.36631,21.8272249 L12.5837092,25.7160716 L10.526648,25.5716463 L13.1304031,20.8168077 L10.8011084,15.6354107 L12.8564994,15.4909854 L14.2282447,19.3775929 L14.5004782,19.3775929 L16.0091753,15.2021348 L18.2026316,15.0593889 L15.4608113,20.5296365 L18.2043018,26.1465485 L16.0108455,26.0021232 L14.36631,21.8272249 Z" id="形状" fill="#23B08D" fill-rule="nonzero"></path>
<polygon id="路径" fill="#E5E7E6" points="23.1612903 8.61290323 34 8.61290323 34 33.9032258 23.1612903 33.9032258"></polygon>
<path d="M23.1612903,14.0322581 L30.3870968,14.0322581 L30.3870968,16.3352193 L23.1612903,16.3352193 L23.1612903,14.0322581 Z M23.1612903,18.8840053 L30.3870968,18.8840053 L30.3870968,21.1869666 L23.1612903,21.1869666 L23.1612903,18.8840053 Z M23.1612903,24.3744581 L30.3870968,24.3744581 L30.3870968,26.6774194 L23.1612903,26.6774194 L23.1612903,24.3744581 Z" id="形状" fill="#FFFFFF" fill-rule="nonzero"></path>
</g>
</g>
</g>
</g>
</svg>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment