Skip to content

W
welfare
Commit ecb10d3e by 萱草
Options

Merge branch 'feature/福利中心-礼品管理' into dev 

# Conflicts:
#	dist/css/chunk-0fe9d25e.bb67f6ae.css
#	dist/index.html
#	dist/js/app.26247c03.js
#	dist/js/chunk-1d411a5e.d9cfc2e1.js
#	dist/js/chunk-3339acd5.efdda8b8.js
#	dist/js/chunk-3a7bafff.44f73cad.js
#	dist/js/chunk-db2a00e6.5a70d9b9.js
parents e4072d82 97e9e37b
Showing with 67 additions and 98 deletions
dist/css/card-package.20f50691.css → dist/css/card-package.6e465790.css
.ml40[data-v-04c6aa56]{margin-left:40px}.filter-block[data-v-04c6aa56]{color:#303133;background:#f7f8fa;padding:20px;margin-bottom:20px}.filter-block span[data-v-04c6aa56]{margin-left:10px;margin-right:10px;line-height:20px}.card[data-v-04c6aa56]{padding-left:70px;min-height:70px;position:relative}.card img[data-v-04c6aa56]{position:absolute;left:0;top:0;width:60px;height:60px;border-radius:4px}.card .name[data-v-04c6aa56]{color:#303133;padding-top:8px;margin-bottom:7px;line-height:22px}.el-icon-delete[data-v-3e211f3a]{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-3e211f3a]:hover{background:#fef0f0;border:1px solid #fbc4c4;color:#f5222d}
\ No newline at end of file
.ml40[data-v-90e25754]{margin-left:40px}.filter-block[data-v-90e25754]{color:#303133;background:#f7f8fa;padding:20px;margin-bottom:20px}.filter-block span[data-v-90e25754]{margin-left:10px;margin-right:10px;line-height:20px}.card[data-v-90e25754]{padding-left:70px;min-height:70px;position:relative}.card img[data-v-90e25754]{position:absolute;left:0;top:0;width:60px;height:60px;border-radius:4px}.card .name[data-v-90e25754]{color:#303133;padding-top:8px;margin-bottom:7px;line-height:22px}.el-icon-delete[data-v-3e211f3a]{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-3e211f3a]:hover{background:#fef0f0;border:1px solid #fbc4c4;color:#f5222d}
\ No newline at end of file
dist/css/chunk-1a5794e5.f846e45d.css 0 → 100644
.step-text[data-v-12f6f60a]{color:#000;font-size:14px}.dash-style[data-v-12f6f60a]{border-bottom:1px dashed #2f54eb}.upload-btn[data-v-12f6f60a]{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-12f6f60a]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-12f6f60a]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-12f6f60a]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-12f6f60a]{padding:0}.w-630[data-v-12f6f60a]{width:630px}.mb56[data-v-12f6f60a]{margin-bottom:56px}.from-content[data-v-12f6f60a]{position:relative}.from-content .demo-ruleForm .form-section[data-v-12f6f60a]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-12f6f60a]{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-12f6f60a]: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-12f6f60a]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-12f6f60a]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .fixed-btn[data-v-12f6f60a]{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-12f6f60a]{margin-top:12px}.from-content .anchor-link[data-v-12f6f60a]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-12f6f60a]{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-12f6f60a]{color:#909399;margin-left:15px}.from-content .see-btn[data-v-12f6f60a]:hover{color:#2f54ed}.ml20[data-v-12f6f60a]{margin-left:20px}.mr10[data-v-12f6f60a]{margin-right:10px}.tips-content[data-v-12f6f60a]{position:absolute;left:-4px;top:6px}.store-tips[data-v-12f6f60a]{width:200px;position:absolute;left:-10px}.underline[data-v-12f6f60a]{text-decoration:underline}.pickup-upload[data-v-12f6f60a]{display:inline-block;vertical-align:top;margin-left:10px}.pickup-upload .upload-trigger[data-v-12f6f60a]{border-style:dashed}.pickup-upload .upload-trigger .upload-icon[data-v-12f6f60a]{font-size:14px}.pickup-upload .pickup-list[data-v-12f6f60a]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-12f6f60a]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-12f6f60a]{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-2503fb08.7a5b166e.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}.w360[data-v-69dea756]{width:360px}.w-160[data-v-69dea756]{width:160px}.w140[data-v-69dea756]{width:140px}.w350[data-v-69dea756]{width:350px}.tab-top[data-v-69dea756]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-69dea756],.tab-top[data-v-69dea756]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-69dea756]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-69dea756]{height:60px}.table-content .img-text img[data-v-69dea756]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-69dea756]{display:inline-block;vertical-align:top;width:75%;height:60px;margin-left:3px;font-size:13px;line-height:14px;position:relative}.table-content .img-text .text .goods-descript[data-v-69dea756]{display:-webkit-box;display:-ms-flexbox;display:flex;color:#606266;line-height:18px;font-size:14px}.table-content .img-text .text .goods-code[data-v-69dea756]{color:#909399;font-size:12px;line-height:16px;margin-bottom:2px;position:absolute;bottom:2px}.table-content .img-text .el-icon-edit-outline[data-v-69dea756]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-69dea756]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-69dea756]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-69dea756]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-69dea756]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-69dea756]:hover{color:#2f54ed}.undeline-dash[data-v-69dea756]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-69dea756]{display:inline-block;line-height:32px}.hidden-data[data-v-69dea756]{max-width:180px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.stock-box .el-tooltip__popper{width:150px}
\ No newline at end of file
dist/css/chunk-3339acd5.0f29488e.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}.w360[data-v-2eb9b096]{width:360px}.w-160[data-v-2eb9b096]{width:160px}.w140[data-v-2eb9b096]{width:140px}.w350[data-v-2eb9b096]{width:350px}.tab-top[data-v-2eb9b096]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-2eb9b096],.tab-top[data-v-2eb9b096]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-2eb9b096]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-2eb9b096]{height:60px}.table-content .img-text img[data-v-2eb9b096]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-2eb9b096]{display:inline-block;vertical-align:top;width:75%;height:60px;margin-left:3px;font-size:13px;line-height:14px;position:relative}.table-content .img-text .text .goods-descript[data-v-2eb9b096]{display:-webkit-box;display:-ms-flexbox;display:flex;color:#606266;line-height:18px;font-size:14px}.table-content .img-text .text .goods-code[data-v-2eb9b096]{color:#909399;font-size:12px;line-height:16px;margin-bottom:2px;position:absolute;bottom:2px}.table-content .img-text .el-icon-edit-outline[data-v-2eb9b096]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-2eb9b096]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-2eb9b096]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-2eb9b096]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-2eb9b096]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-2eb9b096]:hover{color:#2f54ed}.undeline-dash[data-v-2eb9b096]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-2eb9b096]{display:inline-block;line-height:32px}.hidden-data[data-v-2eb9b096]{max-width:180px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.stock-box .el-tooltip__popper{width:150px}
\ No newline at end of file
dist/css/chunk-3a7bafff.65b1a072.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}.w360[data-v-0d1697c0]{width:360px}.w-160[data-v-0d1697c0]{width:160px}.w140[data-v-0d1697c0]{width:140px}.w350[data-v-0d1697c0]{width:350px}.tab-top[data-v-0d1697c0]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-0d1697c0],.tab-top[data-v-0d1697c0]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-0d1697c0]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-0d1697c0]{height:60px}.table-content .img-text img[data-v-0d1697c0]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-0d1697c0]{display:inline-block;vertical-align:top;width:75%;height:60px;margin-left:3px;font-size:13px;line-height:14px;position:relative}.table-content .img-text .text .goods-descript[data-v-0d1697c0]{display:-webkit-box;display:-ms-flexbox;display:flex;color:#606266;line-height:18px;font-size:14px}.table-content .img-text .text .goods-code[data-v-0d1697c0]{color:#909399;font-size:12px;line-height:16px;margin-bottom:2px;position:absolute;bottom:2px}.table-content .img-text .el-icon-edit-outline[data-v-0d1697c0]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-0d1697c0]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-0d1697c0]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-0d1697c0]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-0d1697c0]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-0d1697c0]:hover{color:#2f54ed}.undeline-dash[data-v-0d1697c0]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-0d1697c0]{display:inline-block;line-height:32px}.hidden-data[data-v-0d1697c0]{max-width:180px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.stock-box .el-tooltip__popper{width:150px}
\ No newline at end of file
dist/css/chunk-db2a00e6.dabf5f20.css deleted 100644 → 0
.step-text[data-v-65af295c]{color:#000;font-size:14px}.dash-style[data-v-65af295c]{border-bottom:1px dashed #2f54eb}.upload-btn[data-v-65af295c]{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-65af295c]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-65af295c]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-65af295c]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-65af295c]{padding:0}.w-630[data-v-65af295c]{width:630px}.mb56[data-v-65af295c]{margin-bottom:56px}.from-content[data-v-65af295c]{position:relative}.from-content .demo-ruleForm .form-section[data-v-65af295c]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-65af295c]{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-65af295c]: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-65af295c]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-65af295c]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .fixed-btn[data-v-65af295c]{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-65af295c]{margin-top:12px}.from-content .anchor-link[data-v-65af295c]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-65af295c]{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-65af295c]{color:#909399;margin-left:15px}.from-content .see-btn[data-v-65af295c]:hover{color:#2f54ed}.ml20[data-v-65af295c]{margin-left:20px}.mr10[data-v-65af295c]{margin-right:10px}.tips-content[data-v-65af295c]{position:absolute;left:-4px;top:6px}.store-tips[data-v-65af295c]{width:200px;position:absolute;left:-10px}.underline[data-v-65af295c]{text-decoration:underline}.pickup-upload[data-v-65af295c]{display:inline-block;vertical-align:top;margin-left:10px}.pickup-upload .upload-trigger[data-v-65af295c]{border-style:dashed}.pickup-upload .upload-trigger .upload-icon[data-v-65af295c]{font-size:14px}.pickup-upload .pickup-list[data-v-65af295c]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-65af295c]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-65af295c]{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-f2802392.b3408b2b.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}.w360[data-v-34351082]{width:360px}.w-160[data-v-34351082]{width:160px}.w140[data-v-34351082]{width:140px}.w350[data-v-34351082]{width:350px}.tab-top[data-v-34351082]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-34351082],.tab-top[data-v-34351082]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-34351082]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-34351082]{height:60px}.table-content .img-text img[data-v-34351082]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-34351082]{display:inline-block;vertical-align:top;width:75%;height:60px;margin-left:3px;font-size:13px;line-height:14px;position:relative}.table-content .img-text .text .goods-descript[data-v-34351082]{display:-webkit-box;display:-ms-flexbox;display:flex;color:#606266;line-height:18px;font-size:14px}.table-content .img-text .text .goods-code[data-v-34351082]{color:#909399;font-size:12px;line-height:16px;margin-bottom:2px;position:absolute;bottom:2px}.table-content .img-text .el-icon-edit-outline[data-v-34351082]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-34351082]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-34351082]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-34351082]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-34351082]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-34351082]:hover{color:#2f54ed}.undeline-dash[data-v-34351082]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-34351082]{display:inline-block;line-height:32px}.hidden-data[data-v-34351082]{max-width:180px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.stock-box .el-tooltip__popper{width:150px}
\ No newline at end of file
dist/css/gic-card.c656c4c9.css deleted 100644 → 0
.upload[data-v-55ea4ded]{display:inline-block;width:175px;line-height:15px!important}.file-list[data-v-55ea4ded]{margin-left:95px}.file-list li[data-v-55ea4ded]{height:37px;line-height:37px;background:#f2f3f7;border-radius:2px;margin-bottom:5px;padding-left:13px;padding-right:27px;margin-top:10px}.file-list li i[data-v-55ea4ded]{margin-top:12px}.file-list li p[data-v-55ea4ded]{display:inline-block;width:80%;margin-left:5px}.rule[data-v-55ea4ded]{color:#909399;padding-top:22px;margin-top:36px;border-top:1px solid #e4e7ed;margin-bottom:11px}.rule+ul[data-v-55ea4ded]{color:#909399}.rule+ul li[data-v-55ea4ded]{font-size:12px;line-height:20px}.ct[data-v-1a4621fb]{padding-left:20px;padding-right:20px;position:relative}.ct i[data-v-1a4621fb]{position:absolute;left:0;top:3px}.ct p[data-v-1a4621fb]{font-size:13px;font-weight:400;color:#606266;line-height:22px}.ct .tips[data-v-1a4621fb]{font-size:13px;line-height:1;color:#606266;margin-left:90px;margin-top:8px}.ct .tips[data-v-1a4621fb]:before{content:"*";color:#ff943e;margin-right:3px}[data-v-4f3ad0a9] .el-table__row .hover-btn{opacity:0;-webkit-transition:all .1s;transition:all .1s}[data-v-4f3ad0a9] .el-table__row.hover-row .hover-btn{opacity:1}.card[data-v-4f3ad0a9]{padding-left:70px;min-height:70px;position:relative}.card img[data-v-4f3ad0a9]{position:absolute;left:0;top:0;width:60px;height:60px;border-radius:4px}.card .name[data-v-4f3ad0a9]{color:#303133;padding-top:8px;margin-bottom:7px;line-height:22px}.ct-block[data-v-4f3ad0a9]{background:rgba(47,84,235,.07);text-align:center;padding:20px 0 16px}.ct-block p[data-v-4f3ad0a9]{font-size:16px;color:#303133;line-height:22px}.ct-block div[data-v-4f3ad0a9]{margin:10px 0 15px;color:#606266;line-height:17px}.ml40[data-v-4f3ad0a9]{margin-left:40px}.filter-block[data-v-4f3ad0a9]{color:#303133;background:#f7f8fa;padding:20px;margin-bottom:20px}.filter-block span[data-v-4f3ad0a9]{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-76a64d3b]{margin-top:8px}.cardForm[data-v-76a64d3b]{padding:30px 20px}.cardForm .w165[data-v-76a64d3b]{width:165px!important}.cardForm .w265[data-v-76a64d3b]{width:265px!important}.cardForm .tips[data-v-76a64d3b]{font-size:12px;color:#909399;margin-left:8px}.cardForm .step[data-v-76a64d3b]{margin:20px auto 48px}.cardForm[data-v-76a64d3b] .el-form .el-input-number .el-input,.cardForm[data-v-76a64d3b] .el-form .el-select .el-input{width:100%}.cardForm[data-v-76a64d3b] .el-form .w260,.w260[data-v-76a64d3b] input,.w260[data-v-76a64d3b] textarea{width:260px}.cardEffectiveMode1[data-v-76a64d3b]{position:relative}.cardEffectiveMode1-time[data-v-76a64d3b]{position:absolute;top:0;left:100px}.cardEffectiveMode1-time.is2[data-v-76a64d3b]{top:47px}.content[data-v-76a64d3b]{margin-bottom:30px}.info .row[data-v-427ff922] .el-form-item{margin-bottom:12px}.w500[data-v-427ff922] input,.w500[data-v-427ff922] textarea{width:500px}.card-info[data-v-427ff922]{padding:24px 20px;position:relative}.card-info .title[data-v-427ff922]{font-size:14px;font-weight:700;color:#303133;line-height:22px;margin-bottom:24px}.card-info[data-v-427ff922] .btn-area{display:none}.card-info[data-v-427ff922] .el-form-item__content{color:#303133}.card-info[data-v-427ff922] .el-form .el-input-number .el-input,.card-info[data-v-427ff922] .el-form .el-select .el-input{width:100%}.card-info[data-v-427ff922] .el-form .dm-input,.card-info[data-v-427ff922] .el-form .el-input,.card-info[data-v-427ff922] .el-form .el-input-number,.card-info[data-v-427ff922] .el-form .el-select,.card-info[data-v-427ff922] .el-form .el-textarea{width:352px}.cardSelect[data-v-1324332a] .el-button{width:350px!important}.cardSelect[data-v-1324332a] .reveal .card img.flag{display:none}[data-v-1324332a] .dashed-btn .el-button{width:350px;border-style:dashed;border-radius:2px}[data-v-1324332a] .dashed-btn .el-button:not(.is-disabled){background:#fff;color:#606266;border-color:#c0c4cc}[data-v-1324332a] .dashed-btn .el-button:not(.is-disabled):hover{border-color:#2f54eb;color:#2f54eb}[data-v-1324332a] .dashed-btn .el-button.is-disabled{color:#c0c4cc}
\ No newline at end of file
dist/js/chunk-vendors.4a0b36ab.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/chunk-vendors.e1d4da3a.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/gic-card.31b7be5b.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/gic-card.3fe1de39.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/gift-manage/real-gift-detail.vue
......@@ -184,7 +184,7 @@
<dm-input-amount v-model="goodsForm.costPrice" width="180" :min="0" :max="999999.99" :precision="2" :disabled="goodsStandardInfo.length > 0"></dm-input-amount>
</el-form-item>
<el-form-item label="可占用库存" class="w-630" prop="stock">
<dm-input-number v-model="goodsForm.stock" width="180" :min="0" :max="999999" :precision="2" :disabled="goodsStandardInfo.length > 0" placeholder="上传文件后自动填充"></dm-input-number>
<dm-input-number v-model="goodsForm.stock" width="180" :min="0" :max="999999" :precision="2" :disabled="goodsStandardInfo.length > 0"></dm-input-number>
</el-form-item>
<el-form-item prop="marketPrice" label="市场价:">
<dm-input-amount v-model="goodsForm.marketPrice" width="180" :min="0" :max="999999.99" :precision="2"></dm-input-amount>
......@@ -290,21 +290,21 @@ 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 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('请输入时间'));
......@@ -410,7 +410,8 @@ export default {
},
goodsRules: {
giftName: [ { required: true, message: '请输入礼品名称', trigger: 'blur' } ],
marketPrice: [ { validator: marketPriceValidator, trigger: 'blur' } ],
costPrice: [ { required: true, message: '请输入成本', trigger: 'blur' } ],
stock: [ { required: true, message: '请输入可占用库存', trigger: 'blur' } ],
refundFlag: [ { required: true, message: '请选择是否支持退款', trigger: 'change' } ],
deliveryList: [ { required: true, message: '请选择配送方式', trigger: 'change' } ],
checkList: [ { required: true, message: '请选择库存消耗方式', trigger: 'change' } ],
......@@ -1769,39 +1770,10 @@ export default {
.add-sku-button .el-button--text{
color: #303133;
}
/* .table-error .el-form-item__error {
display: none !important;
} */
/* .damolish .el-form-item__label::after {
content: "";
} */
/* .damolish .el-tooltip__popper {
width: 245px;
} */
.sku-table th.star div::before {
content: '*';
color: red;
}
/* .cord-list .el-select-dropdown__item {
position: relative;
}
.cord-list .delete-icon {
position: absolute;
right: 10px;
top: 9px;
display: none;
color: #909399;
}
.cord-list .delete-icon .el-icon-error {
color: #c0c4c0;
}
.cord-list .delete-icon:hover .el-icon-error {
color: #909399;
}
.cord-list .el-select-dropdown__item:hover .delete-icon {
display: inline-block;
} */
.right-border {
border-right: 1px solid #ebeef5;
}
......@@ -1811,14 +1783,4 @@ export default {
.hidden-limit .dm-input__counter{
display: none;
}
/* .mopney-input span {
display: none !important;
} */
/* .from-content .see-btn {
color: #909399;
margin-left: 15px;
}
.from-content .see-btn:hover {
color: #2f54ed;
} */
</style>
src/views/gift-manage/real-gift.vue
......@@ -62,7 +62,7 @@
<dm-preview-img :img="scope.row.giftImgUrl" style="display:inline-block;border: 1px solid #dcdfe6;padding:4px;border-radius:2px;" width="50" height="50"></dm-preview-img>
<div class="text">
<p class="goods-descript">
<el-tooltip class="item" effect="dark" :content="scope.row.giftName" placement="top">
<el-tooltip open-delay="200" class="item" effect="dark" :content="scope.row.giftName" placement="top">
<span class="inline-block hidden-data">{{ scope.row.giftName || '--' }}</span>
</el-tooltip>
<el-popover placement="top" trigger="hover" @show="getName(scope.row.giftName)">
......@@ -289,17 +289,30 @@ export default {
},
methods: {
init() {
this.searchType = 1;
this.getTableList();
},
getSearchList() {
if (this.searchType === 1) {
this.query.giftName = this.search;
this.query.giftNo = '';
this.query.giftBarNo = '';
this.query.giftId = '';
} else if (this.searchType === 2) {
this.query.giftNo = this.search;
this.query.giftBarNo = '';
this.query.giftId = '';
this.query.giftName = '';
} else if (this.searchType === 3) {
this.query.giftBarNo = this.search;
this.query.giftNo = '';
this.query.giftName = '';
this.query.giftId = '';
} else if (this.searchType === 4) {
this.query.giftId = this.search;
this.query.giftNo = '';
this.query.giftBarNo = '';
this.query.giftName = '';
}
this.query.pageNum = 1;
this.getTableList();
......@@ -315,6 +328,7 @@ export default {
} else if (this.searchType === 4) {
this.placeholderText = '福利id';
}
console.log(this.searchType);
},
// 实物礼品列表
getTableList() {
......
src/views/gift-manage/virtual-gift-detail.vue
......@@ -22,7 +22,7 @@
</div>
<div class="form-section">
<h3>库存信息</h3>
<el-form-item label="成本" class="w-630" prop="costPrice">
<el-form-item label="成本" class="w-630" prop="virCostPrice">
<dm-input-amount v-model="goodsForm.virCostPrice" width="180" :min="0" :max="999999.99" :precision="2"></dm-input-amount>
</el-form-item>
<el-form-item label="库存" class="w-630" prop="stock">
......@@ -48,7 +48,7 @@
<div class="form-section">
<h3>福利设置</h3>
<!-- 虚拟 -->
<el-form-item label="发货内容" required>
<el-form-item label="发货内容" required prop="template">
<template>
<div style="display:flex;">
<dm-editor width="500" height="300" :value="goodsForm.template" :placeholder="template" @change="handleChange2" :readonly="readonly"></dm-editor>
......@@ -59,31 +59,16 @@
<el-step>
<div slot="description" style="width:360px">
<span class="step-text">编辑发货内容，变量请使用大括号标记"{}"。</span>
<el-button type="text" @click="saveDescription">点击生成模板</el-button></div>
<!-- <el-button type="text" @click="saveDescription">点击生成模板</el-button></div> -->
</div>
</el-step>
<el-step>
<div slot="description">
<span class="step-text">下载当前内容生成的模板。</span>
<el-button type="text" @click="downloadFile">点击下载模板</el-button></div>
<span class="step-text">下载模板并以“变量”为表头填入变量值。</span>
<el-button type="text" @click="downloadFile">点击下载</el-button></div>
</el-step>
<el-step>
<div slot="description">
<!-- <div>
<span class="inline-block step-text" style="margin-bottom:20px">上传完善后的文件。</span>
<el-upload class="upload-ele inline-block" :action="uploadAction" :show-file-list="false" :on-change="beforeUploadFile" with-credentials>
<el-button class="block" @click="templateUpload"><i class="el-icon-upload2" style="margin-right:5px"></i>点击上传</el-button>
<span class="block">{{fileName}}</span>
</el-upload>
<el-popover placement="top" trigger="hover">
<div style="font-size:6px">
1.填充空缺内容，导出所有项均为必填项;<br>
2.请勿导入重复的内容，导入的内容在原来基础上增加库存;<br>
3.上传完整仅支持.xlsx .xls文件的导入，填充数据不超过“10万”条;
</div>
<el-button slot="reference" type="text">查看导入规则</el-button>
</el-popover>
</div>
<el-button type="text" class="block" @click="checkUploadDetail">查看内容</el-button> -->
<div class="pickup-upload">
<span class="inline-block step-text" style="margin-bottom:20px">上传完善后的文件。</span>
<dm-upload-file
......@@ -102,7 +87,7 @@
<el-popover trigger="click" placement="right" popper-class="upload-popper">
<el-button slot="reference" type="text">查看导入规则</el-button>
<div class="upload-tip-text">
<p>1.填充空缺内容，导出所有项均为必填项;</p>
<p>1.请按照顺序维护表头，所有变量均为必填项;</p>
<p>2.请勿导入重复的内容，导入的内容在原来基础上增加库存;</p>
<p>3.上传完整仅支持.xlsx .xls文件的导入，填充数据不超过“10万”条;</p>
</div>
......@@ -111,12 +96,6 @@
</span>
<div slot="file-item" slot-scope="{fileData}">{{ fileData.name }}</div>
</dm-upload-file>
<!-- <div class="pickup-list" v-if="uploadFile.name">
<p class="pickup-list-name">
<i class="iconfont-welfare4 icon-wenjian1 file-icon"></i>
{{ uploadFile.name }}
</p>
</div> -->
</div>
</div>
</el-step>
......@@ -234,11 +213,12 @@ export default {
template: '示例1:<br>卡号：{01}<br>卡密：{02}<br><br>示例2：<br>点击卡密链接，使用星巴克电子券二维码直接在门店核销。<br>{卡密链接}<br> 使用条款：<br>本电子代金券需一次性使用完毕，不可兑换现金，不找零，不与其他优惠同享。<br>您可凭以上所示二维码在有效期内前往中国大陆地区星巴克门店购买商品',
goodsRules: {
giftName: [ { required: true, message: '请输入礼品名称', trigger: 'blur' } ],
marketPrice: [ { required: true, message: '请输入', trigger: 'blur' } ],
// marketPrice: [ { 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' } ]
checkList: [ { required: true, message: '请选择库存消耗方式', trigger: 'change' } ],
template: [ { required: true, message: '请输入发货内容', trigger: 'blur' } ]
},
giftId: '',
editorWidth: 900,
......@@ -328,6 +308,9 @@ export default {
// });
},
downloadFile() {
if(!this.isEdit){
this.saveDescription();
}
const prev = process.env['NODE_ENV'] === 'development' ? '' : '/welfare'; // eslint-disable-line
window.open(`${prev}/static/虚拟礼品卡券模板.xlsx`, '_blank');
},
......
src/views/gift-manage/virtual-gift.vue
......@@ -61,7 +61,7 @@
<dm-preview-img :img="scope.row.giftImgUrl" style="display:inline-block;border: 1px solid #dcdfe6;padding:4px;border-radius:2px;" width="50" height="50"></dm-preview-img>
<div class="text">
<p class="goods-descript">
<el-tooltip class="item" effect="dark" :content="scope.row.giftName" placement="top">
<el-tooltip open-delay="200" class="item" effect="dark" :content="scope.row.giftName" placement="top">
<span class="inline-block hidden-data">{{ scope.row.giftName || '--' }}</span>
</el-tooltip>
<el-popover placement="top" trigger="click" @show="getName(scope.row.giftName)">
......@@ -321,12 +321,24 @@ export default {
getSearchList() {
if (this.searchType === 1) {
this.query.giftName = this.search;
this.query.giftNo = '';
this.query.giftBarNo = '';
this.query.giftId = '';
} else if (this.searchType === 2) {
this.query.giftNo = this.search;
this.query.giftBarNo = '';
this.query.giftId = '';
this.query.giftName = '';
} else if (this.searchType === 3) {
this.query.giftBarNo = this.search;
this.query.giftNo = '';
this.query.giftName = '';
this.query.giftId = '';
} else if (this.searchType === 4) {
this.query.giftId = this.search;
this.query.giftNo = '';
this.query.giftBarNo = '';
this.query.giftName = '';
}
this.pageNum = 1;
this.getTableList();
......
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