Skip to content

W
welfare
Commit 38721d10 by 萱草
Options

update: 更改

parent defa8cbd
Showing with 52 additions and 45 deletions
dist/css/chunk-2b99ab5f.9eb96d8f.css deleted 100644 → 0
.hidden-limit .dm-input__counter{display:none}.popver-button .el-button:not(.el-button--text){min-width:50px}.right-border{border-right:1px solid #ebeef5}.tab-top[data-v-8b73433c]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-8b73433c],.tab-top[data-v-8b73433c]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-8b73433c]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-8b73433c]{height:60px}.table-content .img-text img[data-v-8b73433c]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-8b73433c]{display:inline-block;vertical-align:top;width:75%;margin-left:3px;font-size:13px;line-height:14px}.table-content .img-text .text .goods-descript[data-v-8b73433c]{color:#606266;line-height:18px;font-size:14px;margin-bottom:25px}.table-content .img-text .text .goods-code[data-v-8b73433c]{color:#909399;font-size:12px;line-height:16px}.table-content .img-text .el-icon-edit-outline[data-v-8b73433c]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-8b73433c]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-8b73433c]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-8b73433c]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-8b73433c]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-8b73433c]:hover{color:#2f54ed}.undeline-dash[data-v-8b73433c]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-8b73433c]{display:inline-block;line-height:32px}.stock-box .el-tooltip__popper{width:150px}
\ No newline at end of file
dist/css/chunk-4279b6de.37357b22.css 0 → 100644
.right-border{border-right:1px solid #ebeef5}.hidden-limit .dm-input__counter{display:none}.popver-button .el-button:not(.el-button--text){min-width:50px}.file-style:hover .upload-trigger[data-v-16033c0a]{border-color:#1890ff}.upload-ele .el-button[data-v-16033c0a]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-16033c0a]{padding:0}.uploadText p[data-v-16033c0a]{line-height:26px}.pickup-upload[data-v-16033c0a]{display:inline-block;vertical-align:top}.pickup-upload .upload-trigger[data-v-16033c0a]{border-style:dashed;margin-right:10px}.pickup-upload .upload-trigger .upload-icon[data-v-16033c0a]{font-size:14px}.pickup-upload .pickup-list[data-v-16033c0a]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-16033c0a]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-16033c0a]{font-size:14px}.tab-top[data-v-25b0541e]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-25b0541e],.tab-top[data-v-25b0541e]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-25b0541e]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-25b0541e]{height:60px}.table-content .img-text img[data-v-25b0541e]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-25b0541e]{display:inline-block;vertical-align:top;width:75%;margin-left:3px;font-size:13px;line-height:14px}.table-content .img-text .text .goods-descript[data-v-25b0541e]{color:#606266;line-height:18px;font-size:14px;margin-bottom:25px}.table-content .img-text .text .goods-code[data-v-25b0541e]{color:#909399;font-size:12px;line-height:16px}.table-content .img-text .el-icon-edit-outline[data-v-25b0541e]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-25b0541e]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-25b0541e]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-25b0541e]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-25b0541e]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-25b0541e]:hover{color:#2f54ed}.undeline-dash[data-v-25b0541e]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-25b0541e]{display:inline-block;line-height:32px}.stock-box .el-tooltip__popper{width:150px}
\ No newline at end of file
dist/css/chunk-8d5fa8a2.ea225a10.css deleted 100644 → 0
.step-text[data-v-720c1d46]{color:#000;font-size:14px}.dash-style[data-v-720c1d46]{border-bottom:1px dashed #2f54eb}.upload-btn[data-v-720c1d46]{height:40px;border:1px dashed #c0c4cc;display:inline-block;font-size:14px;color:#c0c4cc;cursor:pointer;margin-right:10px;width:250px;border-radius:4px}.upload-btn .el-icon-upload2[data-v-720c1d46]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-720c1d46]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-720c1d46]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-720c1d46]{padding:0}.w-630[data-v-720c1d46]{width:630px}.mb56[data-v-720c1d46]{margin-bottom:56px}.from-content[data-v-720c1d46]{position:relative}.from-content .demo-ruleForm .form-section[data-v-720c1d46]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-720c1d46]{color:#303133;font-size:14px;font-weight:700;margin-bottom:31px;margin-left:20px;padding-bottom:9px;border-bottom:1px solid #dfdfdf}.from-content .demo-ruleForm .form-section h3[data-v-720c1d46]:before{clear:both;content:"";display:inline-block;overflow:hidden;width:3px;height:12px;line-height:14px;margin-right:8px;background:#2f54eb}.from-content .demo-ruleForm .form-section .tip-warm[data-v-720c1d46]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-720c1d46]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .fixed-btn[data-v-720c1d46]{width:100%;height:56px;position:fixed;bottom:0;left:200px;background:#fff;border-top:1px solid #e4e7ed;text-align:center;margin-left:-100px;z-index:2;font-size:0}.from-content .demo-ruleForm .fixed-btn .el-button[data-v-720c1d46]{margin-top:12px}.from-content .anchor-link[data-v-720c1d46]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-720c1d46]{height:24px;line-height:24px;color:#606266;font-size:12px;border-left:2px solid #ebeef5;padding-left:18px;cursor:pointer}.from-content .see-btn[data-v-720c1d46]{color:#909399;margin-left:15px}.from-content .see-btn[data-v-720c1d46]:hover{color:#2f54ed}.ml20[data-v-720c1d46]{margin-left:20px}.mr10[data-v-720c1d46]{margin-right:10px}.tips-content[data-v-720c1d46]{position:absolute;left:-4px;top:6px}.store-tips[data-v-720c1d46]{width:200px;position:absolute;left:-10px}.underline[data-v-720c1d46]{text-decoration:underline}.pickup-upload[data-v-720c1d46]{display:inline-block;vertical-align:top;margin-left:10px}.pickup-upload .upload-trigger[data-v-720c1d46]{border-style:dashed}.pickup-upload .upload-trigger .upload-icon[data-v-720c1d46]{font-size:14px}.pickup-upload .pickup-list[data-v-720c1d46]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-720c1d46]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-720c1d46]{font-size:14px}.right-border{border-right:1px solid #ebeef5}.el-step.is-vertical .el-step__line{top:4px}
\ No newline at end of file
dist/css/chunk-c6adf6a0.c017f21f.css deleted 100644 → 0
.right-border{border-right:1px solid #ebeef5}.hidden-limit .dm-input__counter{display:none}.popver-button .el-button:not(.el-button--text){min-width:50px}.file-style:hover .upload-trigger[data-v-16033c0a]{border-color:#1890ff}.upload-ele .el-button[data-v-16033c0a]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-16033c0a]{padding:0}.uploadText p[data-v-16033c0a]{line-height:26px}.pickup-upload[data-v-16033c0a]{display:inline-block;vertical-align:top}.pickup-upload .upload-trigger[data-v-16033c0a]{border-style:dashed;margin-right:10px}.pickup-upload .upload-trigger .upload-icon[data-v-16033c0a]{font-size:14px}.pickup-upload .pickup-list[data-v-16033c0a]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-16033c0a]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-16033c0a]{font-size:14px}.tab-top[data-v-784c961c]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-784c961c],.tab-top[data-v-784c961c]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-784c961c]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-784c961c]{height:60px}.table-content .img-text img[data-v-784c961c]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-784c961c]{display:inline-block;vertical-align:top;width:75%;margin-left:3px;font-size:13px;line-height:14px}.table-content .img-text .text .goods-descript[data-v-784c961c]{color:#606266;line-height:18px;font-size:14px;margin-bottom:25px}.table-content .img-text .text .goods-code[data-v-784c961c]{color:#909399;font-size:12px;line-height:16px}.table-content .img-text .el-icon-edit-outline[data-v-784c961c]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-784c961c]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-784c961c]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-784c961c]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-784c961c]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-784c961c]:hover{color:#2f54ed}.undeline-dash[data-v-784c961c]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-784c961c]{display:inline-block;line-height:32px}.stock-box .el-tooltip__popper{width:150px}
\ No newline at end of file
dist/css/chunk-cfe3d58a.c4597f54.css 0 → 100644
.step-text[data-v-2df2d33e]{color:#000;font-size:14px}.dash-style[data-v-2df2d33e]{border-bottom:1px dashed #2f54eb}.upload-btn[data-v-2df2d33e]{height:40px;border:1px dashed #c0c4cc;display:inline-block;font-size:14px;color:#c0c4cc;cursor:pointer;margin-right:10px;width:250px;border-radius:4px}.upload-btn .el-icon-upload2[data-v-2df2d33e]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-2df2d33e]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-2df2d33e]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-2df2d33e]{padding:0}.w-630[data-v-2df2d33e]{width:630px}.mb56[data-v-2df2d33e]{margin-bottom:56px}.from-content[data-v-2df2d33e]{position:relative}.from-content .demo-ruleForm .form-section[data-v-2df2d33e]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-2df2d33e]{color:#303133;font-size:14px;font-weight:700;margin-bottom:31px;margin-left:20px;padding-bottom:9px;border-bottom:1px solid #dfdfdf}.from-content .demo-ruleForm .form-section h3[data-v-2df2d33e]:before{clear:both;content:"";display:inline-block;overflow:hidden;width:3px;height:12px;line-height:14px;margin-right:8px;background:#2f54eb}.from-content .demo-ruleForm .form-section .tip-warm[data-v-2df2d33e]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-2df2d33e]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .fixed-btn[data-v-2df2d33e]{width:100%;height:56px;position:fixed;bottom:0;left:200px;background:#fff;border-top:1px solid #e4e7ed;text-align:center;margin-left:-100px;z-index:2;font-size:0}.from-content .demo-ruleForm .fixed-btn .el-button[data-v-2df2d33e]{margin-top:12px}.from-content .anchor-link[data-v-2df2d33e]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-2df2d33e]{height:24px;line-height:24px;color:#606266;font-size:12px;border-left:2px solid #ebeef5;padding-left:18px;cursor:pointer}.from-content .see-btn[data-v-2df2d33e]{color:#909399;margin-left:15px}.from-content .see-btn[data-v-2df2d33e]:hover{color:#2f54ed}.ml20[data-v-2df2d33e]{margin-left:20px}.mr10[data-v-2df2d33e]{margin-right:10px}.tips-content[data-v-2df2d33e]{position:absolute;left:-4px;top:6px}.store-tips[data-v-2df2d33e]{width:200px;position:absolute;left:-10px}.underline[data-v-2df2d33e]{text-decoration:underline}.pickup-upload[data-v-2df2d33e]{display:inline-block;vertical-align:top;margin-left:10px}.pickup-upload .upload-trigger[data-v-2df2d33e]{border-style:dashed}.pickup-upload .upload-trigger .upload-icon[data-v-2df2d33e]{font-size:14px}.pickup-upload .pickup-list[data-v-2df2d33e]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-2df2d33e]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-2df2d33e]{font-size:14px}.right-border{border-right:1px solid #ebeef5}.el-step.is-vertical .el-step__line{top:4px}
\ No newline at end of file
dist/css/chunk-e3c2f8f0.6118b843.css 0 → 100644
.hidden-limit .dm-input__counter{display:none}.popver-button .el-button:not(.el-button--text){min-width:50px}.right-border{border-right:1px solid #ebeef5}.tab-top[data-v-3832e7b1]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-3832e7b1],.tab-top[data-v-3832e7b1]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-3832e7b1]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-3832e7b1]{height:60px}.table-content .img-text img[data-v-3832e7b1]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-3832e7b1]{display:inline-block;vertical-align:top;width:75%;margin-left:3px;font-size:13px;line-height:14px}.table-content .img-text .text .goods-descript[data-v-3832e7b1]{color:#606266;line-height:18px;font-size:14px;margin-bottom:25px}.table-content .img-text .text .goods-code[data-v-3832e7b1]{color:#909399;font-size:12px;line-height:16px}.table-content .img-text .el-icon-edit-outline[data-v-3832e7b1]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-3832e7b1]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-3832e7b1]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-3832e7b1]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-3832e7b1]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-3832e7b1]:hover{color:#2f54ed}.undeline-dash[data-v-3832e7b1]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-3832e7b1]{display:inline-block;line-height:32px}.stock-box .el-tooltip__popper{width:150px}
\ No newline at end of file
src/views/gift-manage/module/check-upload-detail.vue
......@@ -12,67 +12,72 @@
</el-table-column>
<el-table-column label="用户/会员" prop="name"></el-table-column>
</el-table>
<div class="pagination-conteiner" style="background:#fff;" v-show="total > 0">
<div class="pagination" style="text-align: right;">
<dm-pagination background small @current-change="getTableList" :current-page.sync="currentPage" :page-size="pageSize" layout="prev, pager, next" :total="total" v-if="total != 0"> </dm-pagination>
</div>
</div>
</div>
<div slot="footer" class="dialog-footer">
<el-button @click="cancelSubmit()">取消</el-button>
<el-button type="primary" @click="submitProNanme()">确认</el-button>
</div>
<div slot="footer" class="dialog-footer"></div>
</el-dialog>
</template>
<script>
// import request from '../service/request.js';
// import api from '@/api/gift.js';
// const { virtualCardList } = api;
import api from '@/api/gift.js';
const { virtualCardList } = api;
export default {
props: {
dialogId: {
type: String,
default() {
return '';
}
}
},
data() {
return {
dialogVisible: false,
loading: false,
tableData: [
{
paramOne: '123',
paramTwo: '123',
statusFlag: 0,
name: '测试'
},
{
paramOne: '4556',
paramTwo: '4556',
statusFlag: 1,
name: '测试lall'
}
]
currentPage: 1,
pageSize: 10,
total: '',
tableData: [],
};
},
mounted() {
this.dialogVisible = true;
this.giftId = this.dialogId;
this.getTableList();
},
methods: {
getTableList(){
console.log('查看内容');
// this.loading = true;
// let params = {
// id: '',
// key: ''
// };
// virtualCardList(params).then(res =>{
// console.log(res);
// }).finally(() => this.loading = false);
},
submitProNanme() {
this.dialogVisible = false;
// setInterval(() => {
this.$emit('closeUploadDetail');
// }, 10);
this.loading = true;
let params = {
id: this.giftId,
key: '',
pageSize: this.pageSize,
pageNum: this.currentPage
};
virtualCardList(params).then(res =>{
console.log(res);
this.tableData = res.result.result || [];
this.total = res.result.totalCount;
}).finally(() => this.loading = false);
},
// submitProNanme() {
// this.dialogVisible = false;
// // setInterval(() => {
// this.$emit('closeUploadDetail');
// // }, 10);
// },
// 取消修改
cancelSubmit() {
this.dialogVisible = false;
// setInterval(() => {
this.$emit('closeUploadDetail');
// }, 10);
setInterval(() => {
this.$emit('closeUploadDetail');
}, 10);
}
}
};
......
src/views/gift-manage/virtual-gift-detail.vue
......@@ -107,7 +107,7 @@
<p>3.上传完整仅支持.xlsx .xls文件的导入，填充数据不超过“10万”条;</p>
</div>
</el-popover>
<el-button type="text" class="inline-block ml20" @click="checkUploadDetail">查看内容</el-button>
<el-button type="text" v-if="isEdit" class="inline-block ml20" @click="checkUploadDetail">查看内容</el-button>
</span>
<div slot="file-item" slot-scope="{fileData}">{{ fileData.name }}</div>
</dm-upload-file>
......@@ -170,7 +170,7 @@
</div>
</el-form>
</div>
<check-upload-detail v-if="dialogVisible"></check-upload-detail>
<check-upload-detail v-if="dialogVisible" :dialog-id="dialogId"></check-upload-detail>
</div>
</template>
<script>
......@@ -299,6 +299,8 @@ export default {
},
checkUploadDetail(){
this.dialogVisible = true;
this.dialogId = this.giftId;
console.log(this.dialogId);
},
closeUploadDetail(){
this.dialogVisible = false;
......
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