Skip to content

W
welfare
Commit 9e3bc913 by shaojiawen
Options

Merge branch 'dev' of http://git.gicdev.com/dm4/welfare into dev

parents cede5792 4bf6fc47
Showing with 131 additions and 132 deletions
dist/css/card-package.5f58df41.css deleted 100644 → 0
.ml40[data-v-4d728560]{margin-left:40px}.filter-block[data-v-4d728560]{color:#303133;background:#f7f8fa;padding:20px;margin-bottom:20px}.filter-block span[data-v-4d728560]{margin-left:10px;margin-right:10px;line-height:20px}.card[data-v-4d728560]{padding-left:70px;min-height:70px;position:relative}.card img[data-v-4d728560]{position:absolute;left:0;top:0;width:60px;height:60px;border-radius:4px}.card .name[data-v-4d728560]{color:#303133;padding-top:8px;margin-bottom:7px;line-height:22px}.el-icon-delete[data-v-682cce66]{display:inline-block;font-size:17px;padding:9px;margin-right:10px;color:#909399;border:1px solid #e4e7ed;border-radius:50%;vertical-align:middle;cursor:pointer;position:relative;top:-60px}.el-icon-delete[data-v-682cce66]:hover{background:#fef0f0;border:1px solid #fbc4c4;color:#f5222d}
\ No newline at end of file
dist/css/card-package.7a79b96b.css 0 → 100644
.ml40[data-v-4e6a2810]{margin-left:40px}.filter-block[data-v-4e6a2810]{color:#303133;background:#f7f8fa;padding:20px;margin-bottom:20px}.filter-block span[data-v-4e6a2810]{margin-left:10px;margin-right:10px;line-height:20px}.card[data-v-4e6a2810]{padding-left:70px;min-height:70px;position:relative}.card img[data-v-4e6a2810]{position:absolute;left:0;top:0;width:60px;height:60px;border-radius:4px}.card .name[data-v-4e6a2810]{color:#303133;padding-top:8px;margin-bottom:7px;line-height:22px}.el-icon-delete[data-v-328ceb6e]{display:inline-block;font-size:17px;padding:9px;margin-right:10px;color:#909399;border:1px solid #e4e7ed;border-radius:50%;vertical-align:middle;cursor:pointer;position:relative;top:-60px}.el-icon-delete[data-v-328ceb6e]:hover{background:#fef0f0;border:1px solid #fbc4c4;color:#f5222d}
\ No newline at end of file
dist/css/chunk-5866ea6d.c4414c54.css 0 → 100644
.step-text[data-v-09b3cc23]{color:#000;font-size:14px}.dash-style[data-v-09b3cc23]{border-bottom:1px dashed #2f54eb}.upload-btn[data-v-09b3cc23]{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-09b3cc23]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-09b3cc23]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-09b3cc23]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-09b3cc23]{padding:0}.w-630[data-v-09b3cc23]{width:630px}.mb56[data-v-09b3cc23]{margin-bottom:56px}.from-content[data-v-09b3cc23]{position:relative}.from-content .demo-ruleForm .form-section[data-v-09b3cc23]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-09b3cc23]{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-09b3cc23]: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-09b3cc23]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-09b3cc23]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .fixed-btn[data-v-09b3cc23]{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-09b3cc23]{margin-top:12px}.from-content .anchor-link[data-v-09b3cc23]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-09b3cc23]{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-09b3cc23]{color:#909399;margin-left:15px}.from-content .see-btn[data-v-09b3cc23]:hover{color:#2f54ed}.ml20[data-v-09b3cc23]{margin-left:20px}.mr10[data-v-09b3cc23]{margin-right:10px}.tips-content[data-v-09b3cc23]{position:absolute;left:-4px;top:6px}.store-tips[data-v-09b3cc23]{width:200px;position:absolute;left:-10px}.underline[data-v-09b3cc23]{text-decoration:underline}.pickup-upload[data-v-09b3cc23]{display:inline-block;vertical-align:top;margin-left:10px}.pickup-upload .upload-trigger[data-v-09b3cc23]{border-style:dashed}.pickup-upload .upload-trigger .upload-icon[data-v-09b3cc23]{font-size:14px}.pickup-upload .pickup-list[data-v-09b3cc23]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-09b3cc23]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-09b3cc23]{font-size:14px}.right-border{border-right:1px solid #ebeef5}.step-style .el-step.is-vertical .el-step__line{top:30px;left:8px;-webkit-transform:scaleX(.5);transform:scaleX(.5)}.step-style .el-step__head.is-finish{color:#2f54eb;border-color:#2f54eb}.step-style .el-step__icon.is-text{border:1px solid}.step-style .el-step__icon{width:16px;height:16px}.step-style .el-step__icon-inner{font-size:12px}
\ No newline at end of file
dist/css/chunk-78828c1f.2a51f3ce.css deleted 100644 → 0
.step-text[data-v-0663cc1f]{color:#000;font-size:14px}.dash-style[data-v-0663cc1f]{border-bottom:1px dashed #2f54eb}.upload-btn[data-v-0663cc1f]{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-0663cc1f]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-0663cc1f]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-0663cc1f]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-0663cc1f]{padding:0}.w-630[data-v-0663cc1f]{width:630px}.mb56[data-v-0663cc1f]{margin-bottom:56px}.from-content[data-v-0663cc1f]{position:relative}.from-content .demo-ruleForm .form-section[data-v-0663cc1f]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-0663cc1f]{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-0663cc1f]: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-0663cc1f]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-0663cc1f]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .fixed-btn[data-v-0663cc1f]{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-0663cc1f]{margin-top:12px}.from-content .anchor-link[data-v-0663cc1f]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-0663cc1f]{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-0663cc1f]{color:#909399;margin-left:15px}.from-content .see-btn[data-v-0663cc1f]:hover{color:#2f54ed}.ml20[data-v-0663cc1f]{margin-left:20px}.mr10[data-v-0663cc1f]{margin-right:10px}.tips-content[data-v-0663cc1f]{position:absolute;left:-4px;top:6px}.store-tips[data-v-0663cc1f]{width:200px;position:absolute;left:-10px}.underline[data-v-0663cc1f]{text-decoration:underline}.pickup-upload[data-v-0663cc1f]{display:inline-block;vertical-align:top;margin-left:10px}.pickup-upload .upload-trigger[data-v-0663cc1f]{border-style:dashed}.pickup-upload .upload-trigger .upload-icon[data-v-0663cc1f]{font-size:14px}.pickup-upload .pickup-list[data-v-0663cc1f]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-0663cc1f]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-0663cc1f]{font-size:14px}.right-border{border-right:1px solid #ebeef5}.step-style .el-step.is-vertical .el-step__line{top:30px;left:8px;-webkit-transform:scaleX(.5);transform:scaleX(.5)}.step-style .el-step__head.is-finish{color:#2f54eb;border-color:#2f54eb}.step-style .el-step__icon.is-text{border:1px solid}.step-style .el-step__icon{width:16px;height:16px}.step-style .el-step__icon-inner{font-size:12px}
\ No newline at end of file
dist/css/gic-card.c2c11b9f.css deleted 100644 → 0
[data-v-31ef4600] .el-table__row .hover-btn{opacity:0;-webkit-transition:all .1s;transition:all .1s}[data-v-31ef4600] .el-table__row.hover-row .hover-btn{opacity:1}.card[data-v-31ef4600]{padding-left:70px;min-height:70px;position:relative}.card img[data-v-31ef4600]{position:absolute;left:0;top:0;width:60px;height:60px;border-radius:4px}.card .name[data-v-31ef4600]{color:#303133;padding-top:8px;margin-bottom:7px;line-height:22px}.ct-block[data-v-31ef4600]{background:rgba(47,84,235,.07);text-align:center;padding:20px 0 16px}.ct-block p[data-v-31ef4600]{font-size:16px;color:#303133;line-height:22px}.ct-block div[data-v-31ef4600]{margin:10px 0 15px;color:#606266;line-height:17px}.ml40[data-v-31ef4600]{margin-left:40px}.filter-block[data-v-31ef4600]{color:#303133;background:#f7f8fa;padding:20px;margin-bottom:20px}.filter-block span[data-v-31ef4600]{margin-left:10px;margin-right:10px;line-height:20px}.dm-switch[data-v-457d5c5a] .el-switch__label{color:#606266}.dm-switch[data-v-457d5c5a] .el-switch__label.is-active{color:#303133}.w260[data-v-b43f3084]{width:260px}.result[data-v-34452bfd]{text-align:center}.result p[data-v-34452bfd]:first-child{color:#303133;font-size:14px;line-height:24px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;margin-bottom:24px}.result i[data-v-34452bfd]{font-size:24px;margin-right:8px}.send-preview[data-v-0ab93ec9]{-webkit-transition:all .3s ease;transition:all .3s ease;opacity:0;visibility:hidden;z-index:1000;position:fixed;width:100%;height:100%;overflow-y:hidden;left:0;top:0}.send-preview.visible[data-v-0ab93ec9]{visibility:visible;opacity:1}.send-preview div.block[data-v-0ab93ec9]{margin:0 auto;z-index:3;position:relative;top:0;height:100%;width:100%}.send-preview div.block img[data-v-0ab93ec9]{width:100%}.send-preview ul[data-v-0ab93ec9]{position:absolute;bottom:10px}.send-preview .content[data-v-0ab93ec9]{height:100%;width:100%;position:absolute;left:0;top:0}.send-preview .content .avatar[data-v-0ab93ec9]{position:absolute;right:75.5px;top:119px}.send-preview .content .avatar[data-v-0ab93ec9] i{font-size:18px;line-height:35px}.send-preview .content .blk[data-v-0ab93ec9]{position:absolute;padding:22px 15px 13px 15px;right:129.5px;top:119px;width:224px;background:#fff;-webkit-box-shadow:0 2px 8px 0 rgba(0,0,0,.1);box-shadow:0 2px 8px 0 rgba(0,0,0,.1);border-radius:10px}.send-preview .content .blk .card[data-v-0ab93ec9]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.send-preview .content .blk .card i[data-v-0ab93ec9]{position:relative;top:2px}.send-preview .content .blk pre[data-v-0ab93ec9]{margin:15px auto;line-height:18px}.send-preview .bg[data-v-0ab93ec9]{position:absolute;left:0;top:0;width:100%;height:100%;z-index:1;display:block;background:rgba(0,0,0,.5)}.send-preview .btn[data-v-0ab93ec9]{position:absolute;height:80px;width:368px;top:773px;left:63px;background:#fff;overflow:hidden;border-radius:0 0 50px 50px}.send-preview .btn li[data-v-0ab93ec9]{float:left;width:50%;line-height:80px;color:#606266;text-align:center;font-size:18px}.send-preview .btn li.active[data-v-0ab93ec9]{color:#2f54eb}.page[data-v-0ab93ec9]{width:308px;position:absolute;top:98px;left:50%;margin-left:-154px}.page .title[data-v-0ab93ec9]{color:#335782;font-size:16px;margin:16px 0;text-align:center}.page .page-card[data-v-0ab93ec9]{background:#fff;padding:20px;height:650px;border-radius:4px}.page .give-rule[data-v-0ab93ec9]{margin-top:70px}.page .give-rule dd[data-v-0ab93ec9]{text-align:center;color:#2c3038;font-size:18px;margin-bottom:20px;padding-bottom:20px;border-bottom:1px solid #e6e6e6}.page .give-rule dt[data-v-0ab93ec9]{font-size:14px;line-height:24px}.page .card-content[data-v-0ab93ec9]{-webkit-box-shadow:0 2px 8px 0 rgba(136,148,156,.15);box-shadow:0 2px 8px 0 rgba(136,148,156,.15);overflow:hidden;position:relative;height:70px;padding-left:91px;background:#fff}.page .card-content img.exchange[data-v-0ab93ec9]{width:50px}.page .card-content .dl[data-v-0ab93ec9]{-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;width:91px;color:#fff;height:100%;text-align:center;position:absolute;left:0;top:0;background:#3970b5}.page .card-content .dl[data-v-0ab93ec9]:after{content:"";width:6px;height:100%;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAKCAYAAAB8OZQwAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyhpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTM4IDc5LjE1OTgyNCwgMjAxNi8wOS8xNC0wMTowOTowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTcgKE1hY2ludG9zaCkiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NEYyRkY1NkUxQTFGMTFFQTkyMEVEREQ1QjZENzFBNjQiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NEYyRkY1NkYxQTFGMTFFQTkyMEVEREQ1QjZENzFBNjQiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo0RjJGRjU2QzFBMUYxMUVBOTIwRURERDVCNkQ3MUE2NCIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo0RjJGRjU2RDFBMUYxMUVBOTIwRURERDVCNkQ3MUE2NCIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Ph7O54QAAABGSURBVHjaYvrx48cvID4JxFH///9nAGEGIOc/Ep4KEmQEcRhQQTQTAybIxyZoiE2QAZvgeWyCE9EFp7Gzsy9jwOZ4gAADABluO3AWsN5PAAAAAElFTkSuQmCC) repeat-y;position:absolute;left:-3px;top:0}.page .card-content .dl p[data-v-0ab93ec9]{text-overflow:ellipsis;overflow:hidden;white-space:nowrap;font-size:28px;font-weight:700;line-height:100px;height:100px;text-align:center}.page .card-content .dl p span[data-v-0ab93ec9]{margin-right:2px;font-size:18px}.page .card-d[data-v-0ab93ec9]{padding:10px 10px 5px 10px;position:relative;height:100%}.page .card-d-title[data-v-0ab93ec9]{height:18px;font-size:13px;font-weight:500;color:#2c3038;line-height:18px;margin-bottom:11px;position:relative;margin-top:2px;padding-left:48px}.page .card-d-title span[data-v-0ab93ec9]{position:absolute;left:-20px;bottom:-7px;width:84px;padding:2px 0 2px;border-radius:1px;text-align:center;color:#fff;line-height:28px;font-weight:400;font-size:20px;display:inline-block;-webkit-transform:scale(.5);transform:scale(.5)}.page .card-d-time[data-v-0ab93ec9]{height:15px;font-size:12px;font-weight:400;color:#2c3038;line-height:15px}.page .card-d-option[data-v-0ab93ec9]{width:calc(200% - 48px);position:absolute;bottom:0;left:-40%;font-size:22px;font-weight:400;color:#2c3038;line-height:32px;-webkit-transform:scale(.5);transform:scale(.5);display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.page .card-d-option img[data-v-0ab93ec9]{width:24px;height:24px}.page .card-d-option .right[data-v-0ab93ec9]{margin-left:auto}.slide-fade-enter-active[data-v-0ab93ec9]{-webkit-transition:all .3s ease;transition:all .3s ease}.slide-fade-leave-active[data-v-0ab93ec9]{-webkit-transition:all .8s cubic-bezier(1,.5,.8,1);transition:all .8s cubic-bezier(1,.5,.8,1)}.slide-fade-enter[data-v-0ab93ec9],.slide-fade-leave-to[data-v-0ab93ec9]{-webkit-transform:translateX(10px);transform:translateX(10px);opacity:0}.mt8[data-v-5dfc879c]{margin-top:8px}.cardForm[data-v-5dfc879c]{padding:30px 20px}.cardForm .w165[data-v-5dfc879c]{width:165px!important}.cardForm .w265[data-v-5dfc879c]{width:265px!important}.cardForm .tips[data-v-5dfc879c]{font-size:12px;color:#909399;margin-left:8px}.cardForm .step[data-v-5dfc879c]{margin:20px auto 48px}.cardForm[data-v-5dfc879c] .el-form .el-input-number .el-input,.cardForm[data-v-5dfc879c] .el-form .el-select .el-input{width:100%}.cardForm[data-v-5dfc879c] .el-form .w260,.w260[data-v-5dfc879c] input,.w260[data-v-5dfc879c] textarea{width:260px}.cardEffectiveMode1[data-v-5dfc879c]{position:relative}.cardEffectiveMode1-time[data-v-5dfc879c]{position:absolute;top:0;left:100px}.cardEffectiveMode1-time.is2[data-v-5dfc879c]{top:47px}.content[data-v-5dfc879c]{margin-bottom:30px}.info .row[data-v-f71e8c96] .el-form-item{margin-bottom:12px}.w500[data-v-f71e8c96] input,.w500[data-v-f71e8c96] textarea{width:500px}.card-info[data-v-f71e8c96]{padding:24px 20px;position:relative}.card-info .title[data-v-f71e8c96]{font-size:14px;font-weight:700;color:#303133;line-height:22px;margin-bottom:24px}.card-info[data-v-f71e8c96] .btn-area{display:none}.card-info[data-v-f71e8c96] .el-form-item__content{color:#303133}.card-info[data-v-f71e8c96] .el-form .el-input-number .el-input,.card-info[data-v-f71e8c96] .el-form .el-select .el-input{width:100%}.card-info[data-v-f71e8c96] .el-form .dm-input,.card-info[data-v-f71e8c96] .el-form .el-input,.card-info[data-v-f71e8c96] .el-form .el-input-number,.card-info[data-v-f71e8c96] .el-form .el-select,.card-info[data-v-f71e8c96] .el-form .el-textarea{width:352px}.cardSelect[data-v-a1df40ea] .el-button{width:350px!important}.cardSelect[data-v-a1df40ea] .reveal .card img.flag{display:none}[data-v-a1df40ea] .dashed-btn .el-button{width:350px;border-style:dashed;border-radius:2px}[data-v-a1df40ea] .dashed-btn .el-button:not(.is-disabled){background:#fff;color:#606266;border-color:#c0c4cc}[data-v-a1df40ea] .dashed-btn .el-button:not(.is-disabled):hover{border-color:#2f54eb;color:#2f54eb}[data-v-a1df40ea] .dashed-btn .el-button.is-disabled{color:#c0c4cc}
\ No newline at end of file
dist/css/gic-card.fa8233f9.css 0 → 100644
[data-v-7a4d7ab0] .el-table__row .hover-btn{opacity:0;-webkit-transition:all .1s;transition:all .1s}[data-v-7a4d7ab0] .el-table__row.hover-row .hover-btn{opacity:1}.card[data-v-7a4d7ab0]{padding-left:70px;min-height:70px;position:relative}.card img[data-v-7a4d7ab0]{position:absolute;left:0;top:0;width:60px;height:60px;border-radius:4px}.card .name[data-v-7a4d7ab0]{color:#303133;padding-top:8px;margin-bottom:7px;line-height:22px}.ct-block[data-v-7a4d7ab0]{background:rgba(47,84,235,.07);text-align:center;padding:20px 0 16px}.ct-block p[data-v-7a4d7ab0]{font-size:16px;color:#303133;line-height:22px}.ct-block div[data-v-7a4d7ab0]{margin:10px 0 15px;color:#606266;line-height:17px}.ml40[data-v-7a4d7ab0]{margin-left:40px}.filter-block[data-v-7a4d7ab0]{color:#303133;background:#f7f8fa;padding:20px;margin-bottom:20px}.filter-block span[data-v-7a4d7ab0]{margin-left:10px;margin-right:10px;line-height:20px}.dm-switch[data-v-457d5c5a] .el-switch__label{color:#606266}.dm-switch[data-v-457d5c5a] .el-switch__label.is-active{color:#303133}.w260[data-v-b43f3084]{width:260px}.result[data-v-34452bfd]{text-align:center}.result p[data-v-34452bfd]:first-child{color:#303133;font-size:14px;line-height:24px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;margin-bottom:24px}.result i[data-v-34452bfd]{font-size:24px;margin-right:8px}.send-preview[data-v-0ab93ec9]{-webkit-transition:all .3s ease;transition:all .3s ease;opacity:0;visibility:hidden;z-index:1000;position:fixed;width:100%;height:100%;overflow-y:hidden;left:0;top:0}.send-preview.visible[data-v-0ab93ec9]{visibility:visible;opacity:1}.send-preview div.block[data-v-0ab93ec9]{margin:0 auto;z-index:3;position:relative;top:0;height:100%;width:100%}.send-preview div.block img[data-v-0ab93ec9]{width:100%}.send-preview ul[data-v-0ab93ec9]{position:absolute;bottom:10px}.send-preview .content[data-v-0ab93ec9]{height:100%;width:100%;position:absolute;left:0;top:0}.send-preview .content .avatar[data-v-0ab93ec9]{position:absolute;right:75.5px;top:119px}.send-preview .content .avatar[data-v-0ab93ec9] i{font-size:18px;line-height:35px}.send-preview .content .blk[data-v-0ab93ec9]{position:absolute;padding:22px 15px 13px 15px;right:129.5px;top:119px;width:224px;background:#fff;-webkit-box-shadow:0 2px 8px 0 rgba(0,0,0,.1);box-shadow:0 2px 8px 0 rgba(0,0,0,.1);border-radius:10px}.send-preview .content .blk .card[data-v-0ab93ec9]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.send-preview .content .blk .card i[data-v-0ab93ec9]{position:relative;top:2px}.send-preview .content .blk pre[data-v-0ab93ec9]{margin:15px auto;line-height:18px}.send-preview .bg[data-v-0ab93ec9]{position:absolute;left:0;top:0;width:100%;height:100%;z-index:1;display:block;background:rgba(0,0,0,.5)}.send-preview .btn[data-v-0ab93ec9]{position:absolute;height:80px;width:368px;top:773px;left:63px;background:#fff;overflow:hidden;border-radius:0 0 50px 50px}.send-preview .btn li[data-v-0ab93ec9]{float:left;width:50%;line-height:80px;color:#606266;text-align:center;font-size:18px}.send-preview .btn li.active[data-v-0ab93ec9]{color:#2f54eb}.page[data-v-0ab93ec9]{width:308px;position:absolute;top:98px;left:50%;margin-left:-154px}.page .title[data-v-0ab93ec9]{color:#335782;font-size:16px;margin:16px 0;text-align:center}.page .page-card[data-v-0ab93ec9]{background:#fff;padding:20px;height:650px;border-radius:4px}.page .give-rule[data-v-0ab93ec9]{margin-top:70px}.page .give-rule dd[data-v-0ab93ec9]{text-align:center;color:#2c3038;font-size:18px;margin-bottom:20px;padding-bottom:20px;border-bottom:1px solid #e6e6e6}.page .give-rule dt[data-v-0ab93ec9]{font-size:14px;line-height:24px}.page .card-content[data-v-0ab93ec9]{-webkit-box-shadow:0 2px 8px 0 rgba(136,148,156,.15);box-shadow:0 2px 8px 0 rgba(136,148,156,.15);overflow:hidden;position:relative;height:70px;padding-left:91px;background:#fff}.page .card-content img.exchange[data-v-0ab93ec9]{width:50px}.page .card-content .dl[data-v-0ab93ec9]{-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;width:91px;color:#fff;height:100%;text-align:center;position:absolute;left:0;top:0;background:#3970b5}.page .card-content .dl[data-v-0ab93ec9]:after{content:"";width:6px;height:100%;background:url([object Module]) repeat-y;position:absolute;left:-3px;top:0}.page .card-content .dl p[data-v-0ab93ec9]{text-overflow:ellipsis;overflow:hidden;white-space:nowrap;font-size:28px;font-weight:700;line-height:100px;height:100px;text-align:center}.page .card-content .dl p span[data-v-0ab93ec9]{margin-right:2px;font-size:18px}.page .card-d[data-v-0ab93ec9]{padding:10px 10px 5px 10px;position:relative;height:100%}.page .card-d-title[data-v-0ab93ec9]{height:18px;font-size:13px;font-weight:500;color:#2c3038;line-height:18px;margin-bottom:11px;position:relative;margin-top:2px;padding-left:48px}.page .card-d-title span[data-v-0ab93ec9]{position:absolute;left:-20px;bottom:-7px;width:84px;padding:2px 0 2px;border-radius:1px;text-align:center;color:#fff;line-height:28px;font-weight:400;font-size:20px;display:inline-block;-webkit-transform:scale(.5);transform:scale(.5)}.page .card-d-time[data-v-0ab93ec9]{height:15px;font-size:12px;font-weight:400;color:#2c3038;line-height:15px}.page .card-d-option[data-v-0ab93ec9]{width:calc(200% - 48px);position:absolute;bottom:0;left:-40%;font-size:22px;font-weight:400;color:#2c3038;line-height:32px;-webkit-transform:scale(.5);transform:scale(.5);display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.page .card-d-option img[data-v-0ab93ec9]{width:24px;height:24px}.page .card-d-option .right[data-v-0ab93ec9]{margin-left:auto}.slide-fade-enter-active[data-v-0ab93ec9]{-webkit-transition:all .3s ease;transition:all .3s ease}.slide-fade-leave-active[data-v-0ab93ec9]{-webkit-transition:all .8s cubic-bezier(1,.5,.8,1);transition:all .8s cubic-bezier(1,.5,.8,1)}.slide-fade-enter[data-v-0ab93ec9],.slide-fade-leave-to[data-v-0ab93ec9]{-webkit-transform:translateX(10px);transform:translateX(10px);opacity:0}.mt8[data-v-5dfc879c]{margin-top:8px}.cardForm[data-v-5dfc879c]{padding:30px 20px}.cardForm .w165[data-v-5dfc879c]{width:165px!important}.cardForm .w265[data-v-5dfc879c]{width:265px!important}.cardForm .tips[data-v-5dfc879c]{font-size:12px;color:#909399;margin-left:8px}.cardForm .step[data-v-5dfc879c]{margin:20px auto 48px}.cardForm[data-v-5dfc879c] .el-form .el-input-number .el-input,.cardForm[data-v-5dfc879c] .el-form .el-select .el-input{width:100%}.cardForm[data-v-5dfc879c] .el-form .w260,.w260[data-v-5dfc879c] input,.w260[data-v-5dfc879c] textarea{width:260px}.cardEffectiveMode1[data-v-5dfc879c]{position:relative}.cardEffectiveMode1-time[data-v-5dfc879c]{position:absolute;top:0;left:100px}.cardEffectiveMode1-time.is2[data-v-5dfc879c]{top:47px}.content[data-v-5dfc879c]{margin-bottom:30px}.info .row[data-v-f71e8c96] .el-form-item{margin-bottom:12px}.w500[data-v-f71e8c96] input,.w500[data-v-f71e8c96] textarea{width:500px}.card-info[data-v-f71e8c96]{padding:24px 20px;position:relative}.card-info .title[data-v-f71e8c96]{font-size:14px;font-weight:700;color:#303133;line-height:22px;margin-bottom:24px}.card-info[data-v-f71e8c96] .btn-area{display:none}.card-info[data-v-f71e8c96] .el-form-item__content{color:#303133}.card-info[data-v-f71e8c96] .el-form .el-input-number .el-input,.card-info[data-v-f71e8c96] .el-form .el-select .el-input{width:100%}.card-info[data-v-f71e8c96] .el-form .dm-input,.card-info[data-v-f71e8c96] .el-form .el-input,.card-info[data-v-f71e8c96] .el-form .el-input-number,.card-info[data-v-f71e8c96] .el-form .el-select,.card-info[data-v-f71e8c96] .el-form .el-textarea{width:352px}.cardSelect[data-v-a1df40ea] .el-button{width:350px!important}.cardSelect[data-v-a1df40ea] .reveal .card img.flag{display:none}[data-v-a1df40ea] .dashed-btn .el-button{width:350px;border-style:dashed;border-radius:2px}[data-v-a1df40ea] .dashed-btn .el-button:not(.is-disabled){background:#fff;color:#606266;border-color:#c0c4cc}[data-v-a1df40ea] .dashed-btn .el-button:not(.is-disabled):hover{border-color:#2f54eb;color:#2f54eb}[data-v-a1df40ea] .dashed-btn .el-button.is-disabled{color:#c0c4cc}
\ No newline at end of file
dist/js/chunk-vendors.a6adec24.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/chunk-vendors.e1d4da3a.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/gic-card.327ffbb7.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/gic-card.9e6fc960.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
public/index.html
......@@ -48,7 +48,7 @@
<script src="//web-1251519181.file.myqcloud.com/components/preview-img.1.0.3.js"></script><!-- 图片预览 -->
<script src="//web-1251519181.file.myqcloud.com/components/delete.1.1.4.js"></script><!-- 删除轻弹窗 -->
<script src="//web-1251519181.file.myqcloud.com/components/input-number.1.0.11.js"></script><!-- 输入框 -->
<script src="//web-1251519181.file.myqcloud.com/components/welfare-selector.0.0.7.js"></script><!-- 福利选择器 -->
<script src="//web-1251519181.file.myqcloud.com/components/welfare-selector.0.0.11.js"></script><!-- 福利选择器 -->
<script src="//web-1251519181.file.myqcloud.com/components/acc-group-select.1.0.5.js"></script><!-- 账号分组组件 -->
<script src="//web-1251519181.file.myqcloud.com/components/editor.1.1.13.js"></script><!-- 富文本编辑器 -->
</body>
......
src/components/stock-list/index.vue
......@@ -33,7 +33,7 @@
<el-table-column prop="creatorName" label="操作人" min-width="120"> </el-table-column>
<el-table-column prop="appName" label="调整应用" min-width="120"> </el-table-column>
<el-table-column prop="activityName" label="活动名称" min-width="120"> </el-table-column>
<el-table-column prop="descr" label="备注" min-width="140" show-overflow-tooltip> </el-table-column>
<el-table-column prop="remark" label="备注" min-width="140" show-overflow-tooltip> </el-table-column>
</el-table>
<div class="clearfix">
<dm-pagination class="fr mb0" v-if="tableList.length" background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></dm-pagination>
......
src/views/card/card-package/form.vue
......@@ -183,8 +183,11 @@ export default {
methods: {
// 添加卡券
saveWelfare(welfare) {
console.log(welfare);
const { welfareId, customStock } = welfare;
if(customStock < this.ruleForm.packageStock) {
this.$tips({ message: '卡券库存不能小于当前库存', type: 'warning' });
return;
}
const params = {
couponPackageId: this.couponPackageId,
couponId: welfareId,
......
src/views/card/card-package/list.vue
......@@ -5,7 +5,7 @@
<el-select v-model="listParams.useStatus" class="w160 mr10" placeholder="全部状态" clearable @change="refresh">
<el-option label="已生效" :value="1"></el-option>
<el-option label="已过期" :value="2"></el-option>
<el-option label="已失效" :value="3"></el-option>
<el-option label="未生效" :value="3"></el-option>
</el-select>
<el-button type="text" @click="isOpen = !isOpen">{{ isOpen ? '收起' : '展开' }}<i :class="`${isOpen ? 'el-icon-arrow-up' : 'el-icon-arrow-down'} el-icon--right ml5`"></i></el-button>
<dm-perm-button :disabled="$itemPerm($itemCode.gicAddPackage)" type="primary" class="mlAuto" @click="$router.push('/card-package/add')">新建卡券包</dm-perm-button>
......@@ -92,7 +92,7 @@
<template slot-scope="scope">
<span class="state-point state-point-success" v-if="scope.row.useStatus == 1">已生效</span>
<span class="state-point state-point-default" v-if="scope.row.useStatus == 2">已过期</span>
<span class="state-point state-point-default" v-if="scope.row.useStatus == 3">已失效</span>
<span class="state-point state-point-default" v-if="scope.row.useStatus == 3">未生效</span>
</template>
</el-table-column>
<el-table-column label="操作" align="left" width="180px" fixed="right">
......
src/views/card/gic-card/card-form.js
......@@ -881,7 +881,8 @@ export default {
importCode({
file,
remark: this.remark,
couponId: this.couponId
couponId: this.couponId,
memberCardId: this.currentAreaId
}).then(res => {
this.uploadFileloading = false;
this.fileList.push({ name: file.name });
......
src/views/card/gic-card/card-list.vue
......@@ -22,12 +22,12 @@
<el-option v-for="(v, i) in cardType" :key="i" :label="v.label" :value="v.value"></el-option>
</el-select>
<el-button type="text" @click="isOpen = !isOpen">{{ isOpen ? '收起' : '展开' }}<i :class="`${isOpen ? 'el-icon-arrow-up' : 'el-icon-arrow-down'} el-icon--right ml5`"></i></el-button>
<!-- ui和原型都没要这个字段 -->
<!-- <el-select v-model="listParams.couponStatus" class="w160" placeholder="全部状态" clearable @change="refresh">
<!-- ui没要这个字段 -->
<el-select v-model="listParams.couponStatus" class="w160" placeholder="全部状态" clearable @change="refresh">
<el-option label="使用中" :value="1"></el-option>
<el-option label="已过期" :value="2"></el-option>
<el-option label="已禁用" :value="3"></el-option>
</el-select> -->
</el-select>
<el-select class="more-select mr10 mlAuto" @change="mutiOption" placeholder="批量操作">
<el-option :disabled="!multipleSelection.length" :value="0">批量设置</el-option>
<el-option :disabled="!multipleSelection.length" :value="1">批量删除</el-option>
......
src/views/card/gic-card/module/import-code.vue
......@@ -85,7 +85,8 @@ export default {
importCode({
file: file.files[0],
remark: this.ruleForm.remark,
couponId: this.couponId
couponId: this.couponId,
memberCardId: this.currentAreaId
}).then(res => {
this.loading = false;
this.$tips({ message: '上传成功', type: 'success' });
......
src/views/gift-manage/module/update-real-cost.vue
......@@ -7,12 +7,12 @@
<template slot-scope="scope">{{ scope.row.cols[k] }}</template>
</el-table-column>
<el-table-column label="成本(元)">
<template slot="header">
<template v-slot:header>
<span>成本(元)</span>
<el-popover placement="top" trigger="click">
<dm-input v-model="banthCost" class="hidden-limit"></dm-input>
<el-popover placement="top" trigger="click" ref="popover">
<dm-input-amount v-model="banthCost" class="hidden-limit" :max="999999.99" :min="0" :precision="2"></dm-input-amount>
<div class="popver-button" style="margin-top:18px;text-align:right">
<el-button type="dafault" size="small">取消</el-button>
<el-button type="dafault" size="small" @click="$refs.popover.showPopper = false">取消</el-button>
<el-button type="primary" size="small" class="ml10 ml10" @click="handleBatch">确认</el-button>
</div>
<el-tooltip slot="reference" content="批量编辑">
......@@ -21,6 +21,7 @@
</el-popover>
</template>
<template slot-scope="scope">
{{ skuSellObj[scope.row.mapId].giftSkuCostPrice }}
<dm-input-amount width="200px" @change="changeSingleCost(skuSellObj[scope.row.mapId].giftSkuId, skuSellObj[scope.row.mapId].giftSkuCostPrice)" v-model.trim="skuSellObj[scope.row.mapId].giftSkuCostPrice" precision="2" :min="0" :max="999999.99"></dm-input-amount>
</template>
</el-table-column>
......@@ -136,6 +137,9 @@ export default {
console.log(this.skuSellObj);
}
this.goodsStandardInfo = this.giftSpecInfo ? JSON.parse(this.giftSpecInfo) : []; // 礼品规格信息
if(this.goodsStandardInfo.length === 0){
this.costPrice = res.result.costPrice;
}
if (this.goodsStandardInfo.length > 0) {
this.isStdImg = this.goodsStandardInfo[0].standardimg === 2 ? true : false;
} else {
......@@ -228,6 +232,7 @@ export default {
}
this.skuSellObj = deepClone(this.skuSellObj);
this.costPrice = this.skuSellObj[this.goodsSkuList[0].mapId].giftSkuCostPrice;
console.log(this.costPrice);
// this.giftSkuId = this.skuSellObj[this.goodsSkuList[0].mapId].giftSkuId;
this.refash = !this.refash;
},
......@@ -299,6 +304,7 @@ export default {
this.updateList.push({ giftSkuId: this.skuSellObj[item].giftSkuId, costPrice: this.skuSellObj[item].giftSkuCostPrice });
}
console.log(this.updateList);
this.banthCost = '';
},
changeSingleCost(id, cost){
console.log(id);
......
src/views/gift-manage/module/update-real-stock.vue
......@@ -12,9 +12,9 @@
</template>
</el-table-column>
<el-table-column label="库存">
<template slot="header">
<template v-slot:header>
<span>库存</span>
<el-popover placement="top" trigger="click">
<el-popover placement="top" trigger="click" ref="popover">
<div>
<el-select v-model="banthStockType" style="width:100px">
<el-option label="增加" :value="1"></el-option>
......@@ -23,7 +23,7 @@
<dm-input-number v-model="banthStock" width="140" style="margin-left:-2px;" controls-position="right" precision="0" :min="0" :max="999999"></dm-input-number>
</div>
<div class="popver-button" style="margin-top:18px;text-align:right">
<el-button type="dafault" size="small">取消</el-button>
<el-button type="dafault" size="small" @click="$refs.popover.showPopper = false">取消</el-button>
<el-button type="primary" size="small" class="ml10 ml10" @click="handleStock">确认</el-button>
</div>
<el-tooltip slot="reference" content="批量编辑">
......@@ -48,7 +48,7 @@
<el-option label="增加" :value="1"></el-option>
<el-option label="减少" :value="0"></el-option>
</el-select>
<dm-input-number v-model="stock" width="140" style="margin-left:-2px;" controls-position="right" @blur="changeSingleStock(giftSkuId, stock, stockType)" precision="0" :min="0" :max="999999"></dm-input-number>
<dm-input-number v-model="stock" width="140" style="margin-left:-1px;" controls-position="right" @blur="changeSingleStock(giftSkuId, stock, stockType)" precision="0" :min="0" :max="999999"></dm-input-number>
</template>
</el-form-item>
</el-form>
......@@ -88,7 +88,7 @@ export default {
// tableData: [],
spanArr: [], // 用于存放每一行记录的合并数
// costChangeObj: [], // 用于存放批量修改后的数据
banthStock: '',
banthStock: undefined,
stockType: 1,
banthStockType: 1,
updateList: [],
......@@ -332,10 +332,12 @@ export default {
this.stock = this.banthStock;
for(let item in this.skuSellObj){
this.skuSellObj[item].stock = this.banthStock;
this.skuSellObj[item].stageStock = this.banthStock;
this.skuSellObj[item].stockType = this.banthStockType;
this.updateList.push({ giftSkuId: this.skuSellObj[item].giftSkuId, stock: this.skuSellObj[item].stock, stockType: this.banthStockType });
}
console.log(this.updateList);
this.banthStock = undefined;
},
changeSingleStock(id, stock, stockType){
if(!stock){
......
src/views/gift-manage/real-gift-detail.vue
......@@ -13,7 +13,7 @@
<div class="member-upload-image">
<dm-upload-picture :action-url="actionUrl" :image-list="image" :max-image-length="maxlength" accept="image/jpeg, image/jpg, image/png, image/gif" :before-upload="beforeUpload" @uploadOnSuccess="uploadOnSuccess" @deleteImage="deleteImage"></dm-upload-picture>
</div>
<span class="tip-warm" style="display:block">图片宽度800*800px，格式jpg/png/gif，大小1MB以内，你可以拖拽图片调整顺序，最多上传 5 张</span>
<span class="tip-warm" style="display:block">图片建议尺寸800*800px，格式jpg/png/gif，大小1MB以内，你可以拖拽图片调整顺序，最多上传 5 张</span>
</div>
</el-form-item>
<el-form-item label="礼品详情">
......@@ -196,11 +196,11 @@
</el-popover>
</div>
</el-form-item>
<el-form-item label="礼品编码" class="w-630" prop="giftNo">
<el-input style="width:260px" v-model="goodsForm.giftNo" placeholder="请输入" :min="0" :max="999999" :precision="2"></el-input>
<el-form-item label="礼品编码" class="w-630" prop="giftNo" :rules="[{ validator: validateGoodsCode, trigger: 'blur' }]">
<el-input style="width:260px" v-model="goodsForm.giftNo" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="礼品条形码" class="w-630" prop="giftBarNo">
<el-input style="width:260px" v-model="goodsForm.giftBarNo" placeholder="请输入" :min="0" :max="999999" :precision="2"></el-input>
<el-form-item label="礼品条形码" class="w-630" prop="giftBarNo" :rules="[{ validator: validateGoodsBarCode, trigger: 'blur' }]">
<el-input style="width:260px" v-model="goodsForm.giftBarNo" placeholder="请输入"></el-input>
</el-form-item>
</div>
<div class="form-section">
......@@ -290,28 +290,6 @@ export default {
selectPickupStore,
},
data() {
// let marketPriceValidator = (rule, value, callback) => {
// let reg = /^[+]{0,1}(\d+)$|^[+]{0,1}(\d+\.\d+)$/;
// if (value) {
// if (!reg.test(Number(value))) {
// return callback(new Error('市场价必须为正数'));
// } else {
// if(Number(value) > 9999999){
// return callback(new Error('市场价最大为7位数'));
// }
// callback();
// }
// } else {
// callback();
// }
// };
let validateTime = (rule, value, callback) => {
if (!value) {
return callback(new Error('请输入时间'));
} else {
callback();
}
};
let validateGoodsCode = (rule, value, callback) => {
if (value) {
let regExp = /^[A-Za-z0-9\-\——]{1,32}$/;
......@@ -324,13 +302,6 @@ export default {
callback();
}
};
let validateGoodsStock = (rule, value, callback) => {
if (value) {
callback();
} else {
return callback(new Error('库存不能为空'));
}
};
let validateGoodsBarCode = (rule, value, callback) => {
if (value) {
let regExp = /^[a-zA-Z0-9]{1,32}$/;
......@@ -343,18 +314,6 @@ export default {
callback();
}
};
let validateGoodsIntegral = (rule, value, callback) => {
if (!value && value != 0) {
this.$message.error('成本不能为空');
return callback(new Error('成本不能为空'));
} else {
if(Number(value) > 9999999){
this.$message.error('成本最大为7位数');
return callback(new Error('成本最大为7位数'));
}
callback();
}
};
return {
uploadUrl: uploadUrl,
bread: [
......@@ -397,12 +356,11 @@ export default {
deliveryType: [], // 配送方式 1物流发货 2门店自提 3文本券码
stockUseType: '', // 库存使用类型（0:占用,1:动态 , 2占用+动态）
deliveryList: [],
costPrice: 0,
costPrice: '',
stock: undefined,
giftNo: '',
giftBarNo: ''
},
validateTime,
pickerOptions: {
disabledDate(time) {
return time.getTime() < new Date().getTime();
......@@ -418,9 +376,7 @@ export default {
operAuthType: [ { required: true, message: '请选择操作人权限', trigger: 'change' } ],
},
validateGoodsCode,
validateGoodsStock,
validateGoodsBarCode,
validateGoodsIntegral,
// 规格信息
goodsStandardInfo: [],
standardList: [], // 当前操作的规格列表
......@@ -682,13 +638,13 @@ export default {
} else {
this.$message.error(res.message);
}
})
.catch(error => {
this.$message.error({
duration: 1000,
message: error.message
});
}).finally(() => this.$emit('updateLoading'));
// .catch(error => {
// this.$message.error({
// duration: 1000,
// message: error.message
// });
// }).finally(() => this.$emit('updateLoading'));
console.log(222);
},
// 上传前
......@@ -697,10 +653,10 @@ export default {
this.$message.error('请上传小于1MB的图片');
return false;
}
if (file.width < 800 || file.width / file.width != 1 / 1) {
this.$message.error('请上传宽度≥800px，宽高比1：1的图片');
return false;
}
// if (file.width < 800 || file.width / file.width != 1 / 1) {
// this.$message.error('请上传宽度≥800px，宽高比1：1的图片');
// return false;
// }
return true;
},
// 上传成功 返回的图片对象 里面有图片 大小 类型 等相关信息
......@@ -942,32 +898,32 @@ export default {
},
// 表格里面的图片上传前面
tableBeforeUpload(file) {
if (file.size > 2 * 1024 * 1024) {
this.$message.error('请上传小于2MB的图片');
return false;
}
// if (file.size > 2 * 1024 * 1024) {
// this.$message.error('请上传小于2MB的图片');
// return false;
// }
if (file.type !== 'image/jpeg' && file.type !== 'image/png' && file.type !== 'image/jpg' && file.type !== 'image/gif') {
this.$message.error('请上传jpg，png，gif格式的图片');
return false;
}
let that = this;
return new Promise(function(resolve, reject) {
let reader = new FileReader();
reader.onload = function(event) {
let image = new Image();
image.onload = function() {
let width = this.width;
let height = this.height;
if (width < 200 || width / height < 1 / 1) {
that.$message.error('请上传正确的图片尺寸');
reject();
}
resolve();
};
image.src = event.target.result;
};
reader.readAsDataURL(file);
});
// let that = this;
// return new Promise(function(resolve, reject) {
// let reader = new FileReader();
// reader.onload = function(event) {
// let image = new Image();
// image.onload = function() {
// let width = this.width;
// let height = this.height;
// if (width < 200 || width / height < 1 / 1) {
// that.$message.error('请上传正确的图片尺寸');
// reject();
// }
// resolve();
// };
// image.src = event.target.result;
// };
// reader.readAsDataURL(file);
// });
},
// 删除规格图片
deleteImg(item) {
......
src/views/gift-manage/virtual-gift-detail.vue
......@@ -13,7 +13,7 @@
<div class="member-upload-image">
<dm-upload-picture :action-url="actionUrl" :image-list="image" :max-image-length="maxlength" accept="image/jpeg, image/jpg, image/png, image/gif" :before-upload="beforeUpload" @uploadOnSuccess="uploadOnSuccess" @deleteImage="deleteImage"></dm-upload-picture>
</div>
<span class="tip-warm" style="display:block">图片宽度800*800px，格式jpg/png/gif，大小1MB以内，你可以拖拽图片调整顺序，最多上传 5 张</span>
<span class="tip-warm" style="display:block">图片建议尺寸800*800px，格式jpg/png/gif，大小1MB以内，你可以拖拽图片调整顺序，最多上传 5 张</span>
</div>
</el-form-item>
<el-form-item label="礼品详情" prop="giftDescrption">
......@@ -38,11 +38,11 @@
</el-popover>
</div>
</el-form-item>
<el-form-item label="礼品编码" class="w-630" prop="giftNo">
<el-input style="width:260px" v-model="goodsForm.giftNo" placeholder="请输入" :min="0" :max="999999" :precision="2"></el-input>
<el-form-item label="礼品编码" class="w-630" prop="giftNo" :rules="[{ validator: validateGoodsCode, trigger: 'blur' }]">
<el-input style="width:260px" v-model="goodsForm.giftNo" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="礼品条形码" class="w-630" prop="giftBarNo">
<el-input style="width:260px" v-model="goodsForm.giftBarNo" placeholder="请输入" :min="0" :max="999999" :precision="2"></el-input>
<el-form-item label="礼品条形码" class="w-630" prop="giftBarNo" :rules="[{ validator: validateGoodsBarCode, trigger: 'blur' }]">
<el-input style="width:260px" v-model="goodsForm.giftBarNo" placeholder="请输入"></el-input>
</el-form-item>
</div>
<div class="form-section">
......@@ -51,7 +51,8 @@
<el-form-item label="发货内容" required prop="template">
<template>
<div style="display:flex;">
<dm-editor width="500" height="300" :value="goodsForm.template" is-sync :placeholder="template" @change="handleChange2" :readonly="readonly"></dm-editor>
<dm-editor width="500" height="300" :value="goodsForm.template" is-sync :placeholder="template" @change="handleChange2" :readonly="$route.query.giftId != ''"></dm-editor>
<!-- <dm-editor width="500" height="300" :value="goodsForm.template" is-sync :placeholder="template" @change="handleChange2" :readonly="false"></dm-editor> -->
<div class="ml20">
<p>用户申请履约后，发货内容将自动发送。</p>
<div style="height: 250px;" class="step-style">
......@@ -172,10 +173,37 @@ export default {
checkUploadDetail,
},
data() {
let validateGoodsCode = (rule, value, callback) => {
if (value) {
let regExp = /^[A-Za-z0-9\-\——]{1,32}$/;
if (!regExp.test(value)) {
return callback(new Error('只支持数字或字母或-或——'));
} else {
callback();
}
} else {
callback();
}
};
let validateGoodsBarCode = (rule, value, callback) => {
if (value) {
let regExp = /^[a-zA-Z0-9]{1,32}$/;
if (!regExp.test(value)) {
return callback(new Error('条形码只能是数字或字母'));
} else {
callback();
}
} else {
callback();
}
};
return {
uploadUrl: uploadUrl,
bread: [
{
breadName: '福利中心'
},
{
breadName: '礼品管理'
},
{
......@@ -189,7 +217,7 @@ export default {
goodsForm: {
giftName: '', // 礼品名称
marketPrice: undefined, // 礼品市场价
virCostPrice: undefined,
virCostPrice: '',
giftImages: '', // 礼品主图URL，分割
giftDescrption: '', // 礼品详情
checkList: [],
......@@ -203,9 +231,9 @@ export default {
stockUseType: '', // 库存使用类型（0:占用,1:动态 , 2占用+动态）
// tableData: [
// {
giftNo: undefined,
giftNo: '',
stock: undefined,
giftBarNo: undefined,
giftBarNo: '',
// }
// ],
template: ''
......@@ -214,12 +242,14 @@ export default {
goodsRules: {
giftName: [ { required: true, message: '请输入礼品名称', trigger: 'blur' } ],
// marketPrice: [ { required: true, message: '请输入', trigger: 'blur' } ],
virCostPrice: [ { required: true, message: '请输入', trigger: 'blur' } ],
virCostPrice: [ { required: true, message: '请输入成本', trigger: 'blur' } ],
refundFlag: [ { required: true, message: '请选择是否支持退款', trigger: 'change' } ],
// deliveryType: [ { required: true, message: '请选择配送方式', trigger: 'change' } ],
checkList: [ { required: true, message: '请选择库存消耗方式', trigger: 'change' } ],
template: [ { required: true, message: '请输入发货内容', trigger: 'blur' } ]
},
validateGoodsCode,
validateGoodsBarCode,
giftId: '',
editorWidth: 900,
// 图片墙数据
......@@ -243,7 +273,7 @@ export default {
dialogVisible: false,
// description: '',
fileName: '',
readonly: false,
// readonly: false,
isEdit: false,
active: 3,
image: [],
......@@ -264,8 +294,8 @@ export default {
this.getLoginUser();
this.giftId = this.$route.query.giftId;
if (this.giftId) {
this.readonly = true;
this.bread[2].breadName = '编辑礼品';
// this.readonly = true;
this.bread[3].breadName = '编辑礼品';
this.getMess();
this.isEdit = true;
}else{
......@@ -500,13 +530,13 @@ export default {
} else {
this.$message.error(res.message);
}
})
.catch(error => {
this.$message.error({
duration: 1000,
message: error.message
});
}).finally(() => this.$emit('updateLoading'));
// .catch(error => {
// this.$message.error({
// duration: 1000,
// message: error.message
// });
// }).finally(() => this.$emit('updateLoading'));
console.log(222);
},
// 上传前
......@@ -515,10 +545,10 @@ export default {
this.$message.error('请上传小于1MB的图片');
return false;
}
if (file.width < 800 || file.width / file.width != 1 / 1) {
this.$message.error('请上传宽度≥800px，宽高比1：1的图片');
return false;
}
// if (file.width < 800 || file.width / file.width != 1 / 1) {
// this.$message.error('请上传宽度≥800px，宽高比1：1的图片');
// return false;
// }
return true;
},
// 上传成功 返回的图片对象 里面有图片 大小 类型 等相关信息
......
src/views/performance-manage/record.vue
......@@ -72,8 +72,8 @@
<span>发货单号：</span>
<el-button type="text" @click="linkToDetail(row.deliveryOrderId)">{{row.deliveryOrderId}}</el-button>
</div>
<div v-if="row.orderFlag == 1 && row.giftType == 2" class="mt10">
{{row.deliveryInfo}}
<div v-if="row.orderFlag == 1 && row.giftType == 2" class="mt10" v-html="row.deliveryInfo">
<!-- {{row.deliveryInfo}} -->
</div>
<div v-else-if="row.orderFlag == 0" class="mt10">
<span style="display:flex">
......
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