Merge branch 'feature/福利中心-礼品管理' of git.gicdev.com:dm4/welfare into feature/福利中心-礼品管理

dist/css/card-package.7a79b96b.css

+.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/card-package.ffe8323d.css

-.ml40[data-v-89174452]{margin-left:40px}.filter-block[data-v-89174452]{color:#303133;background:#f7f8fa;padding:20px;margin-bottom:20px}.filter-block span[data-v-89174452]{margin-left:10px;margin-right:10px;line-height:20px}.card[data-v-89174452]{padding-left:70px;min-height:70px;position:relative}.card img[data-v-89174452]{position:absolute;left:0;top:0;width:60px;height:60px;border-radius:4px}.card .name[data-v-89174452]{color:#303133;padding-top:8px;margin-bottom:7px;line-height:22px}.el-icon-delete[data-v-51536a1e]{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-51536a1e]:hover{background:#fef0f0;border:1px solid #fbc4c4;color:#f5222d}
\ No newline at end of file

dist/css/chunk-1a5794e5.f846e45d.css

-.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-1faddb40.c9d21505.css

+.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-296b439a]{width:360px}.w-160[data-v-296b439a]{width:160px}.w140[data-v-296b439a]{width:140px}.w350[data-v-296b439a]{width:350px}.tab-top[data-v-296b439a]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-296b439a],.tab-top[data-v-296b439a]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-296b439a]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-296b439a]{height:60px}.table-content .img-text img[data-v-296b439a]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-296b439a]{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-296b439a]{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-296b439a]{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-296b439a]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-296b439a]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-296b439a]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-296b439a]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-296b439a]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-296b439a]:hover{color:#2f54ed}.undeline-dash[data-v-296b439a]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-296b439a]{display:inline-block;line-height:32px}.hidden-data[data-v-296b439a]{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-4275b00a.6c8e46f5.css

+.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-c90abad6]{border-color:#1890ff}.upload-ele .el-button[data-v-c90abad6]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-c90abad6]{padding:0}.uploadText p[data-v-c90abad6]{line-height:26px}.pickup-upload[data-v-c90abad6]{display:inline-block;vertical-align:top}.pickup-upload .upload-trigger[data-v-c90abad6]{border-style:dashed;margin-right:10px}.pickup-upload .upload-trigger .upload-icon[data-v-c90abad6]{font-size:14px}.pickup-upload .pickup-list[data-v-c90abad6]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-c90abad6]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-c90abad6]{font-size:14px}.w360[data-v-554c14f5]{width:360px}.w-160[data-v-554c14f5]{width:160px}.w140[data-v-554c14f5]{width:140px}.w350[data-v-554c14f5]{width:350px}.tab-top[data-v-554c14f5]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-554c14f5],.tab-top[data-v-554c14f5]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-554c14f5]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-554c14f5]{height:60px}.table-content .img-text img[data-v-554c14f5]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-554c14f5]{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-554c14f5]{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-554c14f5]{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-554c14f5]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-554c14f5]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-554c14f5]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-554c14f5]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-554c14f5]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-554c14f5]:hover{color:#2f54ed}.undeline-dash[data-v-554c14f5]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-554c14f5]{display:inline-block;line-height:32px}.hidden-data[data-v-554c14f5]{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-32bc2e76.fa2436f1.css → dist/css/chunk-474caa97.19a10178.css

-.el-icon-warning[data-v-3af8fe50]{color:#faad14;font-size:21px}.write-off[data-v-5539a2cd]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;font-size:14px;color:#303133}.write-off .code[data-v-5539a2cd]{margin-top:20px;color:#f5222d;font-size:20px}.empty_block[data-v-aef9879e]:after{content:"\6682\65E0\7269\6D41\4FE1\606F"}.logistics-info[data-v-aef9879e]{display:-webkit-box;display:-ms-flexbox;display:flex}.logistics-info>div[data-v-aef9879e]{-webkit-box-flex:1;-ms-flex:1;flex:1}.logistics-info span[data-v-aef9879e]{display:inline-block}.logistics-info span+span[data-v-aef9879e]{margin-left:10px}.logistics-step[data-v-aef9879e]{margin-top:24px;background:#fafafa;padding:15px 0}.logistics-step h3[data-v-aef9879e]{color:#303133;font-size:16px;border-bottom:1px solid #dcdfe6;padding:0 20px 15px 20px}.logistics-step .logistics-list[data-v-aef9879e]{height:328px;overflow-y:auto;padding:20px}.logistics-step .logistics-item[data-v-aef9879e]{position:relative;padding-bottom:10px}.logistics-step .logistics-line-step[data-v-aef9879e]{display:-webkit-box;display:-ms-flexbox;display:flex;font-size:12px}.logistics-step .logistics-line-step .time[data-v-aef9879e]{margin-right:20px;width:160px;line-height:22px;font-weight:500;color:#303133}.logistics-step .logistics-line-step .content[data-v-aef9879e]{color:#303133;-webkit-box-flex:1;-ms-flex:1;flex:1;line-height:22px}.order-info[data-v-0cdabcb1]{margin:20px 0;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap}.order-info li[data-v-0cdabcb1]{width:33%;margin:10px 0}.delivery-complete[data-v-0cdabcb1]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;padding:20px}.delivery-complete .el-icon-success[data-v-0cdabcb1]{color:#33af4a;font-size:63px}.delivery-complete .el-icon-error[data-v-0cdabcb1]{color:#f5222d;font-size:63px}.delivery-complete p[data-v-0cdabcb1]{margin-top:16px;color:#606266}.delivery-complete p[data-v-0cdabcb1]:first-of-type{margin-top:28px;font-size:24px;color:#303133}.delivery-todo[data-v-0cdabcb1]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.delivery-todo .status-text[data-v-0cdabcb1]{margin-top:50px;color:#303133;font-size:24px;font-weight:700}.delivery-todo .status-description[data-v-0cdabcb1]{margin-top:16px;margin-bottom:40px;color:#606266}.delivery-todo .status[data-v-0cdabcb1]{width:100%;position:relative;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.delivery-todo .status .time[data-v-0cdabcb1]{position:absolute;top:30px;left:30px;color:#909399}.delivery-todo .status .line[data-v-0cdabcb1]{height:1px;background-color:#2f54eb;-webkit-box-flex:1;-ms-flex:1;flex:1;margin:0 20px}.delivery-todo .status i[data-v-0cdabcb1]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;height:24px;width:24px;background-color:#2f54eb;color:#fff;border-radius:50%;-ms-flex-negative:0;flex-shrink:0}.delivery-todo .status i[data-v-0cdabcb1]:last-of-type{border:1px solid #c0c4cc;color:#c0c4cc;background-color:#fff}.delivery-todo .status span[data-v-0cdabcb1]{display:inline-block;margin-left:10px;font-size:16px;color:#303133;font-weight:700}.delivery-todo .status span[data-v-0cdabcb1]:last-of-type{color:#909399;font-weight:700}
+.el-icon-warning[data-v-3af8fe50]{color:#faad14;font-size:21px}.write-off[data-v-5539a2cd]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;font-size:14px;color:#303133}.write-off .code[data-v-5539a2cd]{margin-top:20px;color:#f5222d;font-size:20px}.empty_block[data-v-aef9879e]:after{content:"\6682\65E0\7269\6D41\4FE1\606F"}.logistics-info[data-v-aef9879e]{display:-webkit-box;display:-ms-flexbox;display:flex}.logistics-info>div[data-v-aef9879e]{-webkit-box-flex:1;-ms-flex:1;flex:1}.logistics-info span[data-v-aef9879e]{display:inline-block}.logistics-info span+span[data-v-aef9879e]{margin-left:10px}.logistics-step[data-v-aef9879e]{margin-top:24px;background:#fafafa;padding:15px 0}.logistics-step h3[data-v-aef9879e]{color:#303133;font-size:16px;border-bottom:1px solid #dcdfe6;padding:0 20px 15px 20px}.logistics-step .logistics-list[data-v-aef9879e]{height:328px;overflow-y:auto;padding:20px}.logistics-step .logistics-item[data-v-aef9879e]{position:relative;padding-bottom:10px}.logistics-step .logistics-line-step[data-v-aef9879e]{display:-webkit-box;display:-ms-flexbox;display:flex;font-size:12px}.logistics-step .logistics-line-step .time[data-v-aef9879e]{margin-right:20px;width:160px;line-height:22px;font-weight:500;color:#303133}.logistics-step .logistics-line-step .content[data-v-aef9879e]{color:#303133;-webkit-box-flex:1;-ms-flex:1;flex:1;line-height:22px}.order-info[data-v-1bb9bb28]{margin:20px 0;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap}.order-info li[data-v-1bb9bb28]{width:33%;margin:10px 0}.delivery-complete[data-v-1bb9bb28]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;padding:20px}.delivery-complete .el-icon-success[data-v-1bb9bb28]{color:#33af4a;font-size:63px}.delivery-complete .el-icon-error[data-v-1bb9bb28]{color:#f5222d;font-size:63px}.delivery-complete p[data-v-1bb9bb28]{margin-top:16px;color:#606266}.delivery-complete p[data-v-1bb9bb28]:first-of-type{margin-top:28px;font-size:24px;color:#303133}.delivery-todo[data-v-1bb9bb28]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.delivery-todo .status-text[data-v-1bb9bb28]{margin-top:50px;color:#303133;font-size:24px;font-weight:700}.delivery-todo .status-description[data-v-1bb9bb28]{margin-top:16px;margin-bottom:40px;color:#606266}.delivery-todo .status[data-v-1bb9bb28]{width:100%;position:relative;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.delivery-todo .status .time[data-v-1bb9bb28]{position:absolute;top:30px;left:30px;color:#909399}.delivery-todo .status .line[data-v-1bb9bb28]{height:1px;background-color:#2f54eb;-webkit-box-flex:1;-ms-flex:1;flex:1;margin:0 20px}.delivery-todo .status i[data-v-1bb9bb28]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;height:24px;width:24px;background-color:#2f54eb;color:#fff;border-radius:50%;-ms-flex-negative:0;flex-shrink:0}.delivery-todo .status i[data-v-1bb9bb28]:last-of-type{border:1px solid #c0c4cc;color:#c0c4cc;background-color:#fff}.delivery-todo .status span[data-v-1bb9bb28]{display:inline-block;margin-left:10px;font-size:16px;color:#303133;font-weight:700}.delivery-todo .status span[data-v-1bb9bb28]:last-of-type{color:#909399;font-weight:700}
\ No newline at end of file

dist/css/chunk-fa0c526e.d5c62f81.css → dist/css/chunk-6b67a942.46b9efb2.css

-[data-v-25f84e59] .el-divider--horizontal{margin:16px 0;margin-top:20px}.upload[data-v-25f84e59] .el-button{border-style:dashed}.el-icon-warning[data-v-3af8fe50]{color:#faad14;font-size:21px}.empty_block[data-v-c46fc112]:after{content:"\6682\65E0\7269\6D41\4FE1\606F"}.logistics-info[data-v-c46fc112]{display:-webkit-box;display:-ms-flexbox;display:flex}.logistics-info>div[data-v-c46fc112]{-webkit-box-flex:1;-ms-flex:1;flex:1}.logistics-info span[data-v-c46fc112]{display:inline-block}.logistics-info span+span[data-v-c46fc112]{margin-left:10px}.logistics-step[data-v-c46fc112]{margin-top:24px;background:#fafafa;padding:15px 0}.logistics-step h3[data-v-c46fc112]{color:#303133;font-size:16px;border-bottom:1px solid #dcdfe6;padding:0 20px 15px 20px}.logistics-step .logistics-list[data-v-c46fc112]{height:328px;overflow-y:auto;padding:20px}.logistics-step .logistics-item[data-v-c46fc112]{position:relative;padding-bottom:10px}.logistics-step .logistics-line-step[data-v-c46fc112]{display:-webkit-box;display:-ms-flexbox;display:flex;font-size:12px}.logistics-step .logistics-line-step .time[data-v-c46fc112]{margin-right:20px;width:160px;line-height:22px;font-weight:500;color:#303133}.logistics-step .logistics-line-step .content[data-v-c46fc112]{color:#303133;-webkit-box-flex:1;-ms-flex:1;flex:1;line-height:22px}.write-off[data-v-5539a2cd]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;font-size:14px;color:#303133}.write-off .code[data-v-5539a2cd]{margin-top:20px;color:#f5222d;font-size:20px}.goods-info[data-v-9b45ca54]{height:100%;display:-webkit-box;display:-ms-flexbox;display:flex}.goods-info img[data-v-9b45ca54]{width:62px;height:62px;border:1px solid #f1f3f7;border-radius:5px}.goods-info .goods-text[data-v-9b45ca54]{margin-left:18px;font-size:13px;color:#303133;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.goods-info .goods-text-info[data-v-9b45ca54]{color:#909399;font-size:12px}.goods-info .goods-text-name[data-v-9b45ca54]{margin-bottom:5px;line-height:16px}
+[data-v-25f84e59] .el-divider--horizontal{margin:16px 0;margin-top:20px}.upload[data-v-25f84e59] .el-button{border-style:dashed}.el-icon-warning[data-v-3af8fe50]{color:#faad14;font-size:21px}.empty_block[data-v-c46fc112]:after{content:"\6682\65E0\7269\6D41\4FE1\606F"}.logistics-info[data-v-c46fc112]{display:-webkit-box;display:-ms-flexbox;display:flex}.logistics-info>div[data-v-c46fc112]{-webkit-box-flex:1;-ms-flex:1;flex:1}.logistics-info span[data-v-c46fc112]{display:inline-block}.logistics-info span+span[data-v-c46fc112]{margin-left:10px}.logistics-step[data-v-c46fc112]{margin-top:24px;background:#fafafa;padding:15px 0}.logistics-step h3[data-v-c46fc112]{color:#303133;font-size:16px;border-bottom:1px solid #dcdfe6;padding:0 20px 15px 20px}.logistics-step .logistics-list[data-v-c46fc112]{height:328px;overflow-y:auto;padding:20px}.logistics-step .logistics-item[data-v-c46fc112]{position:relative;padding-bottom:10px}.logistics-step .logistics-line-step[data-v-c46fc112]{display:-webkit-box;display:-ms-flexbox;display:flex;font-size:12px}.logistics-step .logistics-line-step .time[data-v-c46fc112]{margin-right:20px;width:160px;line-height:22px;font-weight:500;color:#303133}.logistics-step .logistics-line-step .content[data-v-c46fc112]{color:#303133;-webkit-box-flex:1;-ms-flex:1;flex:1;line-height:22px}.write-off[data-v-5539a2cd]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;font-size:14px;color:#303133}.write-off .code[data-v-5539a2cd]{margin-top:20px;color:#f5222d;font-size:20px}.goods-info[data-v-97e42e02]{height:100%;display:-webkit-box;display:-ms-flexbox;display:flex}.goods-info img[data-v-97e42e02]{width:62px;height:62px;border:1px solid #f1f3f7;border-radius:5px}.goods-info .goods-text[data-v-97e42e02]{margin-left:18px;font-size:13px;color:#303133;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.goods-info .goods-text-info[data-v-97e42e02]{color:#909399;font-size:12px}.goods-info .goods-text-name[data-v-97e42e02]{margin-bottom:5px;line-height:16px}
\ No newline at end of file

dist/css/chunk-6d4a4dcb.fec0806b.css

-.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-735a576f]{width:360px}.w-160[data-v-735a576f]{width:160px}.w140[data-v-735a576f]{width:140px}.w350[data-v-735a576f]{width:350px}.tab-top[data-v-735a576f]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-735a576f],.tab-top[data-v-735a576f]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-735a576f]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-735a576f]{height:60px}.table-content .img-text img[data-v-735a576f]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-735a576f]{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-735a576f]{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-735a576f]{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-735a576f]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-735a576f]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-735a576f]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-735a576f]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-735a576f]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-735a576f]:hover{color:#2f54ed}.undeline-dash[data-v-735a576f]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-735a576f]{display:inline-block;line-height:32px}.hidden-data[data-v-735a576f]{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-77938c7c.367d6373.css

+.empty_block[data-v-5d2c77a9]:after{content:"\6682\65E0\7269\6D41\4FE1\606F"}.logistics-info[data-v-5d2c77a9]{display:-webkit-box;display:-ms-flexbox;display:flex}.logistics-info>div[data-v-5d2c77a9]{-webkit-box-flex:1;-ms-flex:1;flex:1}.logistics-info span[data-v-5d2c77a9]{display:inline-block}.logistics-info span+span[data-v-5d2c77a9]{margin-left:10px}.logistics-step[data-v-5d2c77a9]{margin-top:24px;background:#fafafa;padding:15px 0}.logistics-step h3[data-v-5d2c77a9]{color:#303133;font-size:16px;border-bottom:1px solid #dcdfe6;padding:0 20px 15px 20px}.logistics-step .logistics-list[data-v-5d2c77a9]{height:328px;overflow-y:auto;padding:20px}.logistics-step .logistics-item[data-v-5d2c77a9]{position:relative;padding-bottom:10px}.logistics-step .logistics-line-step[data-v-5d2c77a9]{display:-webkit-box;display:-ms-flexbox;display:flex;font-size:12px}.logistics-step .logistics-line-step .time[data-v-5d2c77a9]{margin-right:20px;width:160px;line-height:22px;font-weight:500;color:#303133}.logistics-step .logistics-line-step .content[data-v-5d2c77a9]{color:#303133;-webkit-box-flex:1;-ms-flex:1;flex:1;line-height:22px}
\ No newline at end of file

dist/css/chunk-a49129fc.453b6cf9.css

+.step-text[data-v-c6d87fc4]{color:#000;font-size:14px}.dash-style[data-v-c6d87fc4]{border-bottom:1px dashed #2f54eb}.upload-btn[data-v-c6d87fc4]{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-c6d87fc4]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-c6d87fc4]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-c6d87fc4]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-c6d87fc4]{padding:0}.w-630[data-v-c6d87fc4]{width:630px}.mb56[data-v-c6d87fc4]{margin-bottom:56px}.from-content[data-v-c6d87fc4]{position:relative}.from-content .demo-ruleForm .form-section[data-v-c6d87fc4]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-c6d87fc4]{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-c6d87fc4]: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-c6d87fc4]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-c6d87fc4]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .fixed-btn[data-v-c6d87fc4]{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-c6d87fc4]{margin-top:12px}.from-content .anchor-link[data-v-c6d87fc4]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-c6d87fc4]{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-c6d87fc4]{color:#909399;margin-left:15px}.from-content .see-btn[data-v-c6d87fc4]:hover{color:#2f54ed}.ml20[data-v-c6d87fc4]{margin-left:20px}.mr10[data-v-c6d87fc4]{margin-right:10px}.tips-content[data-v-c6d87fc4]{position:absolute;left:-4px;top:6px}.store-tips[data-v-c6d87fc4]{width:200px;position:absolute;left:-10px}.underline[data-v-c6d87fc4]{text-decoration:underline}.pickup-upload[data-v-c6d87fc4]{display:inline-block;vertical-align:top;margin-left:10px}.pickup-upload .upload-trigger[data-v-c6d87fc4]{border-style:dashed}.pickup-upload .upload-trigger .upload-icon[data-v-c6d87fc4]{font-size:14px}.pickup-upload .pickup-list[data-v-c6d87fc4]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-c6d87fc4]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-c6d87fc4]{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-baa9477a.f5adea56.css

-.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-f16dc7d2]{width:360px}.w-160[data-v-f16dc7d2]{width:160px}.w140[data-v-f16dc7d2]{width:140px}.w350[data-v-f16dc7d2]{width:350px}.tab-top[data-v-f16dc7d2]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-f16dc7d2],.tab-top[data-v-f16dc7d2]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-f16dc7d2]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-f16dc7d2]{height:60px}.table-content .img-text img[data-v-f16dc7d2]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-f16dc7d2]{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-f16dc7d2]{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-f16dc7d2]{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-f16dc7d2]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-f16dc7d2]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-f16dc7d2]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-f16dc7d2]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-f16dc7d2]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-f16dc7d2]:hover{color:#2f54ed}.undeline-dash[data-v-f16dc7d2]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-f16dc7d2]{display:inline-block;line-height:32px}.hidden-data[data-v-f16dc7d2]{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-eef171d2.2cde6ef6.css

-.empty_block[data-v-dfb952a4]:after{content:"\6682\65E0\7269\6D41\4FE1\606F"}.logistics-info[data-v-dfb952a4]{display:-webkit-box;display:-ms-flexbox;display:flex}.logistics-info>div[data-v-dfb952a4]{-webkit-box-flex:1;-ms-flex:1;flex:1}.logistics-info span[data-v-dfb952a4]{display:inline-block}.logistics-info span+span[data-v-dfb952a4]{margin-left:10px}.logistics-step[data-v-dfb952a4]{margin-top:24px;background:#fafafa;padding:15px 0}.logistics-step h3[data-v-dfb952a4]{color:#303133;font-size:16px;border-bottom:1px solid #dcdfe6;padding:0 20px 15px 20px}.logistics-step .logistics-list[data-v-dfb952a4]{height:328px;overflow-y:auto;padding:20px}.logistics-step .logistics-item[data-v-dfb952a4]{position:relative;padding-bottom:10px}.logistics-step .logistics-line-step[data-v-dfb952a4]{display:-webkit-box;display:-ms-flexbox;display:flex;font-size:12px}.logistics-step .logistics-line-step .time[data-v-dfb952a4]{margin-right:20px;width:160px;line-height:22px;font-weight:500;color:#303133}.logistics-step .logistics-line-step .content[data-v-dfb952a4]{color:#303133;-webkit-box-flex:1;-ms-flex:1;flex:1;line-height:22px}
\ No newline at end of file

dist/img/app.ab4c23ff.svg

+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 200 200" style="enable-background:new 0 0 200 200;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ADC6FF;}
+	.st1{fill:#303133;}
+</style>
+<path class="st0" d="M99.9,35.2l58,32.4v64.8l-58,32.4l-58-32.4V67.6L99.9,35.2z"/>
+<path class="st1" d="M58.7,70.6C55,68.8,50,70,47.5,73.8s-0.6,8.8,3.1,11.2l41.2,23.8v45.6c0,1.9,0.6,4.4,2.5,5.6
+	c1.2,1.2,3.8,2.5,5.6,2.5c5,0,8.8-3.8,8.8-8.1v-45.6L149.4,85c3.8-2.5,5-7.5,3.1-11.2c-1.2-1.9-3.1-3.1-5-3.8
+	c-1.9-0.6-4.4,0-6.2,0.6L100,94.4L58.7,70.6z"/>
+<path class="st1" d="M100,1.2L13.1,50.6V150l86.9,48.8l86.9-49.4V50.6L100,1.2z M170,140.6l-70,41.2l-70-41.2V59.4l70-41.2l70,40.6
+	V140.6z"/>
+</svg>

dist/js/chunk-0d4ebdfa.76549112.js

-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-0d4ebdfa"],{"48c3":function(t,e,a){"use strict";a.r(e);var i=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{directives:[{name:"loading",rawName:"v-loading",value:t.loading,expression:"loading"}],staticClass:"p20"},[a("div",{staticClass:"pb20 clearfix flex-center"},[a("el-button",{staticClass:"mlAuto",attrs:{type:"primary"},on:{click:function(e){return t.$router.push("/setting/address-lib-add")}}},[t._v("新建地址")])],1),a("el-table",{staticStyle:{width:"100%"},attrs:{"tooltip-effect":"dark",data:t.tableList}},[a("el-table-column",{attrs:{prop:"contact",label:"联系人"}}),a("el-table-column",{attrs:{prop:"phone",label:"联系方式"}}),a("el-table-column",{attrs:{prop:"address",label:"地址"}}),a("el-table-column",{attrs:{label:"地址类型"},scopedSlots:t._u([{key:"default",fn:function(e){return[e.row.defaultFlag?a("el-tag",{staticClass:"mr5"},[t._v("默认")]):t._e(),t._v("\n        "+t._s(1==e.row.type?"退款地址":"--")+"\n      ")]}}])}),a("el-table-column",{attrs:{label:"操作"},scopedSlots:t._u([{key:"default",fn:function(e){return[a("el-button",{attrs:{type:"text"},on:{click:function(a){return t.$router.push("/setting/address-lib-add?id="+e.row.addressId)}}},[t._v("编辑")]),a("dm-delete",{attrs:{tips:"确认删除？"},on:{confirm:function(a){return t.del(e.row)}}},[a("el-button",{attrs:{type:"text"}},[t._v("删除")])],1)]}}])})],1)],1)},s=[],r=a("fab6"),o=a("cdc8"),n=o["a"].getAddressList,d=o["a"].delAddress,l={name:"AddressLibList",mixins:[r["c"]],data:function(){return{loading:!1,listParams:{currentPage:1,pageSize:20},total:0,tableList:[],dialogVisible:!1,addressId:""}},created:function(){this.$emit("updateBread",[{breadName:"福利中心"},{breadName:"通用设置"},{breadName:"地址库管理"}])},mounted:function(){this.getTableList()},methods:{del:function(t){var e=this,a=t.addressId;this.loading=!0,d({addressId:a}).then((function(t){e.loading=!1,e.$tips({type:"success",message:"删除成功"}),e.getTableList()})).finally((function(){e.loading=!1}))},getTableList:function(){var t=this;this.loading||(this.loading=!0,n().then((function(e){t.loading=!1,t.tableList=e.result||[]})).finally((function(){t.loading=!1})))}}},c=l,p=a("2877"),u=Object(p["a"])(c,i,s,!1,null,null,null);e["default"]=u.exports},cdc8:function(t,e,a){"use strict";a.d(e,"b",(function(){return c}));a("8e6e"),a("ac6a"),a("456d");var i=a("ade3"),s=a("71f6"),r=a("f121");function o(t,e){var a=Object.keys(t);if(Object.getOwnPropertySymbols){var i=Object.getOwnPropertySymbols(t);e&&(i=i.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),a.push.apply(a,i)}return a}function n(t){for(var e=1;e<arguments.length;e++){var a=null!=arguments[e]?arguments[e]:{};e%2?o(Object(a),!0).forEach((function(e){Object(i["a"])(t,e,a[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(a)):o(Object(a)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(a,e))}))}return t}var d={getGiftId:"/gift/get-gift-id",giftGet:"/gift/get",giftSave:{url:"/gift/save",method:"post"},giftUpdate:{url:"/gift/update",method:"post"},giftPage:{url:"/gift/page",method:"post"},giftStockRecord:"/gift/stock-record",giftStockLog:"/gift/stock-record-log",giftActivity:"/gift/activity-statistics",giftTemplateDownload:{url:"/gift/vir-gift-template-download",useFormData:!0,method:"post"},giftTemplateUpload:"/gift/template-upload",giftBatchUpdate:{url:"/gift/batch-update",method:"post"},giftStandardNew:"/gift/spec-save",giftStandardList:"/gift/spec-list",giftStandardValueNew:"/gift/spec-value-save",giftStandardValueList:"/gift/spec-value-list",virtualCardList:"/gift/vir-card-page",batchUpdate:{url:"/gift/batch-update",method:"post"},realCostUpdate:{url:"/gift/real-cost-update",method:"post"},realStockUpdate:{url:"/gift/real-stock-update",method:"post"},getPickupList:"/pickup/get-pickup-list",getGiftShopList:"/gift/get-gift-shop-list",updateName:"/gift/update-name",virtualGiftUpload:{url:"/gift/vir-gift-upload",method:"post",headers:{"Content-Type":"multipart/form-data;"},file:!0},operatorSave:{url:"/auth/operator-save",method:"post"},getOperatorList:"/auth/operator-list",virtualCostUpdate:"/gift/vir-cost-update"},l={updateConfig:{url:"/config/update-config",method:"post",headers:{"Content-Type":"application/json"}},getConfigDetail:"/config/get-config-detail",getAddressList:"/address/get-address-list",getAddressDetails:"address/get-address-details",delAddress:"/address/del-address",insertOrUpdateAddress:{url:"/address/insert-or-update-address",method:"post",headers:{"Content-Type":"application/json"}},pickupList:"/pickup/get-pickup-list",getPickupDetails:"/pickup/get-pickup-details",delPickup:{url:"/pickup/del-pickup",useFormData:!0,method:"post"},insertPickupStore:{url:"/pickup/insert-pickup-store",method:"post",headers:{"Content-Type":"application/json"}},updatePickupStore:{url:"/pickup/update-pickup-setting",method:"post",headers:{"Content-Type":"application/json"}}};d=Object(s["a"])(d,r["f"]),l=Object(s["a"])(l,r["f"]),e["a"]=n(n({},d),l);r["c"].api,r["b"];var c=r["c"].api+r["f"]+"/export-pickup-store-excel"},fab6:function(t,e,a){"use strict";a.d(e,"c",(function(){return s})),a.d(e,"a",(function(){return r})),a.d(e,"b",(function(){return o}));var i=a("ed08"),s={methods:{refresh:function(){this.listParams.currentPage=1,this.getTableList()},handleSizeChange:function(t){this.listParams.pageSize=t,this.getTableList()},handleCurrentChange:function(t){this.listParams.currentPage=t,this.getTableList()}}},r={methods:{formatterTimeFunc:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"startTime",e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"endTime",a=arguments.length>2&&void 0!==arguments[2]?arguments[2]:"yyyy-MM-dd",s=arguments.length>3&&void 0!==arguments[3]?arguments[3]:"dateTime";this[s]?(this.listParams[t]=Object(i["e"])(this[s][0],a),this.listParams[e]=Object(i["e"])(this[s][1],a)):this.listParams[t]=this.listParams[e]=""}}},o={methods:{mainHeight:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:0;return this.$store.state.mainHeight-52-t}}}}}]);
\ No newline at end of file

dist/js/chunk-0d4ebdfa.c104ece2.js

+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-0d4ebdfa"],{"48c3":function(t,e,i){"use strict";i.r(e);var a=function(){var t=this,e=t.$createElement,i=t._self._c||e;return i("div",{directives:[{name:"loading",rawName:"v-loading",value:t.loading,expression:"loading"}],staticClass:"p20"},[i("div",{staticClass:"pb20 clearfix flex-center"},[i("el-button",{staticClass:"mlAuto",attrs:{type:"primary"},on:{click:function(e){return t.$router.push("/setting/address-lib-add")}}},[t._v("新建地址")])],1),i("el-table",{staticStyle:{width:"100%"},attrs:{"tooltip-effect":"dark",data:t.tableList}},[i("el-table-column",{attrs:{prop:"contact",label:"联系人"}}),i("el-table-column",{attrs:{prop:"phone",label:"联系方式"}}),i("el-table-column",{attrs:{prop:"address",label:"地址"}}),i("el-table-column",{attrs:{label:"地址类型"},scopedSlots:t._u([{key:"default",fn:function(e){return[e.row.defaultFlag?i("el-tag",{staticClass:"mr5"},[t._v("默认")]):t._e(),t._v("\n        "+t._s(1==e.row.type?"退款地址":"--")+"\n      ")]}}])}),i("el-table-column",{attrs:{label:"操作"},scopedSlots:t._u([{key:"default",fn:function(e){return[i("el-button",{attrs:{type:"text"},on:{click:function(i){return t.$router.push("/setting/address-lib-add?id="+e.row.addressId)}}},[t._v("编辑")]),i("dm-delete",{attrs:{tips:"确认删除？"},on:{confirm:function(i){return t.del(e.row)}}},[i("el-button",{attrs:{type:"text"}},[t._v("删除")])],1)]}}])})],1)],1)},s=[],r=i("fab6"),o=i("cdc8"),n=o["a"].getAddressList,d=o["a"].delAddress,l={name:"AddressLibList",mixins:[r["c"]],data:function(){return{loading:!1,listParams:{currentPage:1,pageSize:20},total:0,tableList:[],dialogVisible:!1,addressId:""}},created:function(){this.$emit("updateBread",[{breadName:"福利中心"},{breadName:"通用设置"},{breadName:"地址库管理"}])},mounted:function(){this.getTableList()},methods:{del:function(t){var e=this,i=t.addressId;this.loading=!0,d({addressId:i}).then((function(t){e.loading=!1,e.$tips({type:"success",message:"删除成功"}),e.getTableList()})).finally((function(){e.loading=!1}))},getTableList:function(){var t=this;this.loading||(this.loading=!0,n().then((function(e){t.loading=!1,t.tableList=e.result||[]})).finally((function(){t.loading=!1})))}}},c=l,p=i("2877"),u=Object(p["a"])(c,a,s,!1,null,null,null);e["default"]=u.exports},cdc8:function(t,e,i){"use strict";i("8e6e"),i("ac6a"),i("456d");var a=i("ade3"),s=i("71f6"),r=i("f121");function o(t,e){var i=Object.keys(t);if(Object.getOwnPropertySymbols){var a=Object.getOwnPropertySymbols(t);e&&(a=a.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),i.push.apply(i,a)}return i}function n(t){for(var e=1;e<arguments.length;e++){var i=null!=arguments[e]?arguments[e]:{};e%2?o(Object(i),!0).forEach((function(e){Object(a["a"])(t,e,i[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(i)):o(Object(i)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(i,e))}))}return t}var d={getGiftId:"/gift/get-gift-id",giftGet:"/gift/get",giftSave:{url:"/gift/save",method:"post"},giftUpdate:{url:"/gift/update",method:"post"},giftPage:{url:"/gift/page",method:"post"},giftStockRecord:"/gift/stock-record",giftStockLog:"/gift/stock-record-log",giftActivity:"/gift/activity-statistics",giftTemplateDownload:{url:"/gift/vir-gift-template-download",useFormData:!0,method:"post"},giftTemplateUpload:"/gift/template-upload",giftBatchUpdate:{url:"/gift/batch-update",method:"post"},giftStandardNew:"/gift/spec-save",giftStandardList:"/gift/spec-list",giftStandardValueNew:"/gift/spec-value-save",giftStandardValueList:"/gift/spec-value-list",virtualCardList:"/gift/vir-card-page",batchUpdate:{url:"/gift/batch-update",method:"post"},realCostUpdate:{url:"/gift/real-cost-update",method:"post"},realStockUpdate:{url:"/gift/real-stock-update",method:"post"},getPickupList:"/pickup/get-pickup-list",getGiftShopList:"/gift/get-gift-shop-list",updateName:"/gift/update-name",virtualGiftUpload:{url:"/gift/vir-gift-upload",method:"post",headers:{"Content-Type":"multipart/form-data;"},file:!0},operatorSave:{url:"/auth/operator-save",method:"post"},getOperatorList:"/auth/operator-list",virtualCostUpdate:"/gift/vir-cost-update"},l={updateConfig:{url:"/config/update-config",method:"post",headers:{"Content-Type":"application/json"}},getConfigDetail:"/config/get-config-detail",getAddressList:"/address/get-address-list",getAddressDetails:"address/get-address-details",delAddress:"/address/del-address",insertOrUpdateAddress:{url:"/address/insert-or-update-address",method:"post",headers:{"Content-Type":"application/json"}},pickupList:"/pickup/get-pickup-list",getPickupDetails:"/pickup/get-pickup-details",delPickup:{url:"/pickup/del-pickup",useFormData:!0,method:"post"},insertPickupStore:{url:"/pickup/insert-pickup-store",method:"post",headers:{"Content-Type":"application/json"}},updatePickupStore:{url:"/pickup/update-pickup-setting",method:"post",headers:{"Content-Type":"application/json"}},exportPickup:"/export-pickup-store-excel"};d=Object(s["a"])(d,r["f"]),l=Object(s["a"])(l,r["f"]),e["a"]=n(n({},d),l);r["c"].api,r["b"],r["c"].api,r["f"]},fab6:function(t,e,i){"use strict";i.d(e,"c",(function(){return s})),i.d(e,"a",(function(){return r})),i.d(e,"b",(function(){return o}));var a=i("ed08"),s={methods:{refresh:function(){this.listParams.currentPage=1,this.getTableList()},handleSizeChange:function(t){this.listParams.pageSize=t,this.getTableList()},handleCurrentChange:function(t){this.listParams.currentPage=t,this.getTableList()}}},r={methods:{formatterTimeFunc:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"startTime",e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"endTime",i=arguments.length>2&&void 0!==arguments[2]?arguments[2]:"yyyy-MM-dd",s=arguments.length>3&&void 0!==arguments[3]?arguments[3]:"dateTime";this[s]?(this.listParams[t]=Object(a["e"])(this[s][0],i),this.listParams[e]=Object(a["e"])(this[s][1],i)):this.listParams[t]=this.listParams[e]=""}}},o={methods:{mainHeight:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:0;return this.$store.state.mainHeight-52-t}}}}}]);
\ No newline at end of file

dist/js/chunk-6287d3af.1650b788.js

-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-6287d3af"],{cdc8:function(t,e,a){"use strict";a.d(e,"b",(function(){return l}));a("8e6e"),a("ac6a"),a("456d");var r=a("ade3"),i=a("71f6"),o=a("f121");function s(t,e){var a=Object.keys(t);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(t);e&&(r=r.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),a.push.apply(a,r)}return a}function c(t){for(var e=1;e<arguments.length;e++){var a=null!=arguments[e]?arguments[e]:{};e%2?s(Object(a),!0).forEach((function(e){Object(r["a"])(t,e,a[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(a)):s(Object(a)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(a,e))}))}return t}var p={getGiftId:"/gift/get-gift-id",giftGet:"/gift/get",giftSave:{url:"/gift/save",method:"post"},giftUpdate:{url:"/gift/update",method:"post"},giftPage:{url:"/gift/page",method:"post"},giftStockRecord:"/gift/stock-record",giftStockLog:"/gift/stock-record-log",giftActivity:"/gift/activity-statistics",giftTemplateDownload:{url:"/gift/vir-gift-template-download",useFormData:!0,method:"post"},giftTemplateUpload:"/gift/template-upload",giftBatchUpdate:{url:"/gift/batch-update",method:"post"},giftStandardNew:"/gift/spec-save",giftStandardList:"/gift/spec-list",giftStandardValueNew:"/gift/spec-value-save",giftStandardValueList:"/gift/spec-value-list",virtualCardList:"/gift/vir-card-page",batchUpdate:{url:"/gift/batch-update",method:"post"},realCostUpdate:{url:"/gift/real-cost-update",method:"post"},realStockUpdate:{url:"/gift/real-stock-update",method:"post"},getPickupList:"/pickup/get-pickup-list",getGiftShopList:"/gift/get-gift-shop-list",updateName:"/gift/update-name",virtualGiftUpload:{url:"/gift/vir-gift-upload",method:"post",headers:{"Content-Type":"multipart/form-data;"},file:!0},operatorSave:{url:"/auth/operator-save",method:"post"},getOperatorList:"/auth/operator-list",virtualCostUpdate:"/gift/vir-cost-update"},n={updateConfig:{url:"/config/update-config",method:"post",headers:{"Content-Type":"application/json"}},getConfigDetail:"/config/get-config-detail",getAddressList:"/address/get-address-list",getAddressDetails:"address/get-address-details",delAddress:"/address/del-address",insertOrUpdateAddress:{url:"/address/insert-or-update-address",method:"post",headers:{"Content-Type":"application/json"}},pickupList:"/pickup/get-pickup-list",getPickupDetails:"/pickup/get-pickup-details",delPickup:{url:"/pickup/del-pickup",useFormData:!0,method:"post"},insertPickupStore:{url:"/pickup/insert-pickup-store",method:"post",headers:{"Content-Type":"application/json"}},updatePickupStore:{url:"/pickup/update-pickup-setting",method:"post",headers:{"Content-Type":"application/json"}}};p=Object(i["a"])(p,o["f"]),n=Object(i["a"])(n,o["f"]),e["a"]=c(c({},p),n);o["c"].api,o["b"];var l=o["c"].api+o["f"]+"/export-pickup-store-excel"},fa56:function(t,e,a){"use strict";a.r(e);var r=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{directives:[{name:"loading",rawName:"v-loading",value:t.loading,expression:"loading"}],staticClass:"p20"},[a("el-form",{ref:"ruleForm",staticStyle:{"min-height":"400px"},attrs:{model:t.ruleForm,rules:t.rules,"label-width":"150px"}},[a("el-form-item",{attrs:{label:"收货自动加库存",prop:"backStockFlag"}},[a("el-switch",{attrs:{"active-value":1,"inactive-value":0},model:{value:t.ruleForm.backStockFlag,callback:function(e){t.$set(t.ruleForm,"backStockFlag",e)},expression:"ruleForm.backStockFlag"}}),a("div",{staticClass:"gray03 fz12"},[t._v("开启自动加库存后，在退货单同意收货后，福利中心可占库存将会增加")])],1),a("el-form-item",[a("el-button",{attrs:{type:"primary"},on:{click:t.submitForm}},[t._v("保存")]),t.ruleForm.updateTime?a("span",{staticClass:"ml10 gray02"},[t._v("最近修改："+t._s(t.formatDateTimeByType(t.ruleForm.updateTime,"yyyy-MM-dd HH:mm:ss")))]):t._e()],1)],1)],1)},i=[],o=(a("8e6e"),a("ac6a"),a("456d"),a("ade3")),s=a("ed08"),c=a("cdc8");function p(t,e){var a=Object.keys(t);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(t);e&&(r=r.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),a.push.apply(a,r)}return a}function n(t){for(var e=1;e<arguments.length;e++){var a=null!=arguments[e]?arguments[e]:{};e%2?p(Object(a),!0).forEach((function(e){Object(o["a"])(t,e,a[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(a)):p(Object(a)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(a,e))}))}return t}var l=c["a"].updateConfig,d=c["a"].getConfigDetail,u={name:"SalesReturnSetting",data:function(){return{loading:!1,ruleForm:{configId:"",backStockFlag:0,createTime:"",updateTime:""},rules:{}}},created:function(){this.$emit("updateBread",[{breadName:"福利中心"},{breadName:"通用设置"},{breadName:"退货单设置"}])},mounted:function(){this.getDetail()},methods:{formatDateTimeByType:s["e"],submitForm:function(){var t=this;this.loading||(this.loading=!0,l({configId:this.ruleForm.configId,backStockFlag:this.ruleForm.backStockFlag}).then((function(e){t.loading=!1,t.getDetail(),t.$tips({message:"保存成功",type:"success"})})).finally((function(){t.loading=!1})))},getDetail:function(){var t=this;d().then((function(e){t.ruleForm=n(n({},t.ruleForm),e.result)}))}}},g=u,f=a("2877"),m=Object(f["a"])(g,r,i,!1,null,null,null);e["default"]=m.exports}}]);
\ No newline at end of file

dist/js/chunk-6287d3af.fa4fbc54.js

+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-6287d3af"],{cdc8:function(t,e,a){"use strict";a("8e6e"),a("ac6a"),a("456d");var r=a("ade3"),i=a("71f6"),o=a("f121");function s(t,e){var a=Object.keys(t);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(t);e&&(r=r.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),a.push.apply(a,r)}return a}function p(t){for(var e=1;e<arguments.length;e++){var a=null!=arguments[e]?arguments[e]:{};e%2?s(Object(a),!0).forEach((function(e){Object(r["a"])(t,e,a[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(a)):s(Object(a)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(a,e))}))}return t}var c={getGiftId:"/gift/get-gift-id",giftGet:"/gift/get",giftSave:{url:"/gift/save",method:"post"},giftUpdate:{url:"/gift/update",method:"post"},giftPage:{url:"/gift/page",method:"post"},giftStockRecord:"/gift/stock-record",giftStockLog:"/gift/stock-record-log",giftActivity:"/gift/activity-statistics",giftTemplateDownload:{url:"/gift/vir-gift-template-download",useFormData:!0,method:"post"},giftTemplateUpload:"/gift/template-upload",giftBatchUpdate:{url:"/gift/batch-update",method:"post"},giftStandardNew:"/gift/spec-save",giftStandardList:"/gift/spec-list",giftStandardValueNew:"/gift/spec-value-save",giftStandardValueList:"/gift/spec-value-list",virtualCardList:"/gift/vir-card-page",batchUpdate:{url:"/gift/batch-update",method:"post"},realCostUpdate:{url:"/gift/real-cost-update",method:"post"},realStockUpdate:{url:"/gift/real-stock-update",method:"post"},getPickupList:"/pickup/get-pickup-list",getGiftShopList:"/gift/get-gift-shop-list",updateName:"/gift/update-name",virtualGiftUpload:{url:"/gift/vir-gift-upload",method:"post",headers:{"Content-Type":"multipart/form-data;"},file:!0},operatorSave:{url:"/auth/operator-save",method:"post"},getOperatorList:"/auth/operator-list",virtualCostUpdate:"/gift/vir-cost-update"},l={updateConfig:{url:"/config/update-config",method:"post",headers:{"Content-Type":"application/json"}},getConfigDetail:"/config/get-config-detail",getAddressList:"/address/get-address-list",getAddressDetails:"address/get-address-details",delAddress:"/address/del-address",insertOrUpdateAddress:{url:"/address/insert-or-update-address",method:"post",headers:{"Content-Type":"application/json"}},pickupList:"/pickup/get-pickup-list",getPickupDetails:"/pickup/get-pickup-details",delPickup:{url:"/pickup/del-pickup",useFormData:!0,method:"post"},insertPickupStore:{url:"/pickup/insert-pickup-store",method:"post",headers:{"Content-Type":"application/json"}},updatePickupStore:{url:"/pickup/update-pickup-setting",method:"post",headers:{"Content-Type":"application/json"}},exportPickup:"/export-pickup-store-excel"};c=Object(i["a"])(c,o["f"]),l=Object(i["a"])(l,o["f"]),e["a"]=p(p({},c),l);o["c"].api,o["b"],o["c"].api,o["f"]},fa56:function(t,e,a){"use strict";a.r(e);var r=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{directives:[{name:"loading",rawName:"v-loading",value:t.loading,expression:"loading"}],staticClass:"p20"},[a("el-form",{ref:"ruleForm",staticStyle:{"min-height":"400px"},attrs:{model:t.ruleForm,rules:t.rules,"label-width":"150px"}},[a("el-form-item",{attrs:{label:"收货自动加库存",prop:"backStockFlag"}},[a("el-switch",{attrs:{"active-value":1,"inactive-value":0},model:{value:t.ruleForm.backStockFlag,callback:function(e){t.$set(t.ruleForm,"backStockFlag",e)},expression:"ruleForm.backStockFlag"}}),a("div",{staticClass:"gray03 fz12"},[t._v("开启自动加库存后，在退货单同意收货后，福利中心可占库存将会增加")])],1),a("el-form-item",[a("el-button",{attrs:{type:"primary"},on:{click:t.submitForm}},[t._v("保存")]),t.ruleForm.updateTime?a("span",{staticClass:"ml10 gray02"},[t._v("最近修改："+t._s(t.formatDateTimeByType(t.ruleForm.updateTime,"yyyy-MM-dd HH:mm:ss")))]):t._e()],1)],1)],1)},i=[],o=(a("8e6e"),a("ac6a"),a("456d"),a("ade3")),s=a("ed08"),p=a("cdc8");function c(t,e){var a=Object.keys(t);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(t);e&&(r=r.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),a.push.apply(a,r)}return a}function l(t){for(var e=1;e<arguments.length;e++){var a=null!=arguments[e]?arguments[e]:{};e%2?c(Object(a),!0).forEach((function(e){Object(o["a"])(t,e,a[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(a)):c(Object(a)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(a,e))}))}return t}var n=p["a"].updateConfig,d=p["a"].getConfigDetail,u={name:"SalesReturnSetting",data:function(){return{loading:!1,ruleForm:{configId:"",backStockFlag:0,createTime:"",updateTime:""},rules:{}}},created:function(){this.$emit("updateBread",[{breadName:"福利中心"},{breadName:"通用设置"},{breadName:"退货单设置"}])},mounted:function(){this.getDetail()},methods:{formatDateTimeByType:s["e"],submitForm:function(){var t=this;this.loading||(this.loading=!0,n({configId:this.ruleForm.configId,backStockFlag:this.ruleForm.backStockFlag}).then((function(e){t.loading=!1,t.getDetail(),t.$tips({message:"保存成功",type:"success"})})).finally((function(){t.loading=!1})))},getDetail:function(){var t=this;d().then((function(e){t.ruleForm=l(l({},t.ruleForm),e.result)}))}}},g=u,f=a("2877"),m=Object(f["a"])(g,r,i,!1,null,null,null);e["default"]=m.exports}}]);
\ No newline at end of file

public/index.html

@@ -34,7 +34,7 @@
     <script src="//web-1251519181.file.myqcloud.com/components/input.2.0.20.js"></script><!-- input !!3.0组件 -->
     <script src="//web-1251519181.file.myqcloud.com/components/store-select.1.1.84.js"></script><!-- 门店选择器 -->
     <script src="//web-1251519181.file.myqcloud.com/components/goods-selector.1.0.51.js"></script><!-- 商品选择器 -->
-    <script src="//web-1251519181.file.myqcloud.com/components/card-select.1.0.33.js"></script><!-- 卡券选择器 -->
+    <script src="//web-1251519181.file.myqcloud.com/components/card-select.1.0.34.js"></script><!-- 卡券选择器 -->
     <script src="//web-1251519181.file.myqcloud.com/components/link-tools.2.1.21.js"></script><!-- 链接小工具 -->
     <script src="//web-1251519181.file.myqcloud.com/components/export-data.1.1.1.js"></script><!-- 数据导出 -->
     <script src="//web-1251519181.file.myqcloud.com/components/integral-select.1.0.26.js"></script><!-- 积分选择器 -->
@@ -47,8 +47,8 @@
     <script src="//web-1251519181.file.myqcloud.com/components/app-info.1.0.5.js"></script><!-- 应用信息 -->
     <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.10.js"></script><!-- 输入框 -->
-    <script src="//web-1251519181.file.myqcloud.com/components/welfare-selector.0.0.6.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.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/api/common.js

@@ -26,6 +26,7 @@ let o2 = {
     method: 'post',
   }, // 库存上传记录
   virtualErrorPage: '/gift/vir-card-error-page', // 库存上传记录-上传错误日志分页
+  getWelfareAppList: '/gift/get-welfare-application-list', // 当前福利支持应用查询
 };
 
 // other

src/api/gift.js

@@ -107,6 +107,7 @@ let setting = {
     method: 'post',
     headers: { 'Content-Type': 'application/json' }
   },
+  exportPickup: '/export-pickup-store-excel'
 };
 realGift = getFetch(realGift, welfarePrefix);
 setting = getFetch(setting, welfarePrefix);

src/assets/images/svg/app.svg

+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 200 200" style="enable-background:new 0 0 200 200;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#ADC6FF;}
+	.st1{fill:#303133;}
+</style>
+<path class="st0" d="M99.9,35.2l58,32.4v64.8l-58,32.4l-58-32.4V67.6L99.9,35.2z"/>
+<path class="st1" d="M58.7,70.6C55,68.8,50,70,47.5,73.8s-0.6,8.8,3.1,11.2l41.2,23.8v45.6c0,1.9,0.6,4.4,2.5,5.6
+	c1.2,1.2,3.8,2.5,5.6,2.5c5,0,8.8-3.8,8.8-8.1v-45.6L149.4,85c3.8-2.5,5-7.5,3.1-11.2c-1.2-1.9-3.1-3.1-5-3.8
+	c-1.9-0.6-4.4,0-6.2,0.6L100,94.4L58.7,70.6z"/>
+<path class="st1" d="M100,1.2L13.1,50.6V150l86.9,48.8l86.9-49.4V50.6L100,1.2z M170,140.6l-70,41.2l-70-41.2V59.4l70-41.2l70,40.6
+	V140.6z"/>
+</svg>

src/components/libs/switch-page.vue

 <template>
-  <div class="switch-page">
-    <el-popover v-if="!(project == '' || project == 'index')" placement="left-end" width="143" trigger="hover" popper-class="sw-page-pop">
+  <div v-if="!(project == '' || project == 'index')" class="switch-page">
+    <el-popover placement="left-end" open-delay="200" width="143" trigger="hover" popper-class="sw-page-pop">
       <div>
         <ul class="toggle">
           <li v-show="!project.includes('gift')">
@@ -15,26 +15,69 @@
         <img src="../../assets/images/svg/more.svg" width="30" height="30" />
       </div>
     </el-popover>
-    <el-popover v-if="!(project == '' || project == 'index')" placement="left-end" width="143" trigger="hover" popper-class="sw-page-pop">
-      <div>
-        ?????
+    <el-popover v-model="showCanUseApp" open-delay="200" placement="left-end" width="365" trigger="hover" popper-class="sw-page-pop" @hide="close">
+      <div class="pl15">
+        <div class="text-right"><i class="el-dialog__close el-icon el-icon-close mr10 cursor" @click="close"></i></div>
+        <ul class="app-list">
+          <li v-for="(item, idx) in appList" :key="idx" @click="goLink(item)">
+            <div>
+              <img :src="item.iconUrl" draggable="false" />
+              <p :title="item.appName" class="ellipsis-100">{{ item.appName }}</p>
+            </div>
+          </li>
+          <div v-if="appList.length == 0" class="empty_block"></div>
+        </ul>
       </div>
       <div class="s-icon" slot="reference">
-        <img src="../../assets/images/svg/more.svg" width="30" height="30" />
+        <img src="../../assets/images/svg/app.svg" width="30" height="30" />
       </div>
     </el-popover>
-    <!-- <div class="s-icon">
-      <img src="../../assets/images/svg/more.svg" width="30" height="30" />
-    </div> -->
   </div>
 </template>
 
 <script>
+import fetch from '@/api/common.js';
+const { getWelfareAppList } = fetch;
+
 export default {
   name: 'SwitchPage',
+  data() {
+    return {
+      showCanUseApp: false,
+      appList: []
+    };
+  },
+  mounted() {
+    this.getAppList();
+  },
+  methods: {
+    close() {
+      this.showCanUseApp = false;
+      this.$store.commit('updateShowCornerCanUseApp', false);
+    },
+    getAppList() {
+      getWelfareAppList().then(res => {
+        this.appList = res.result || [];
+      });
+    },
+    async goLink(item) {
+      localStorage.setItem('appApplicationId', item.applicationId);
+      window.open(item.authorizeUrl, '_blank', 'noopener');
+    },
+  },
   computed: {
     project() {
       return this.$store.state.project;
+    },
+    showCornerCanUseApp() {
+      return this.$store.state.showCornerCanUseApp;
+    }
+  },
+  watch: {
+    showCornerCanUseApp(val) {
+      if(val) {
+        this.showCanUseApp = true;
+      }
     }
   }
 };
@@ -52,11 +95,57 @@ export default {
     padding-top: 9px;
     width: 50px;
     height: 50px;
-    background: #F7F8FA;
+    background: #fff;
     border-radius: 4px;
     border: 1px solid #DCDFE6;
     cursor: pointer;
     text-align: center;
+    transition: all 0.2s;
+    &:hover {
+      background: #F7F8FA;
+    }
+  }
+}
+.app-block {
+  padding-left: 20px;
+}
+.app-list {
+  margin-top: 12px;
+  li {
+    width: 162px;
+    height: 48px;
+    background: #FFFFFF;
+    display: inline-block;
+    margin-right: 10px;
+    margin-bottom: 10px;
+    height: 48px;
+    position: relative;
+    cursor: pointer;
+    &:nth-child(2n) {
+      margin-right: 0px;
+    }
+    div {
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: 100%;
+      box-shadow: 0px 4px 12px 0px rgba(220, 223, 230, 0.6);
+      border: 1px solid #DCDFE6;
+      padding-left: 56px;
+      padding-right: 12px;
+      line-height: 48px;
+      transition: all 0.2s;
+      &:hover {
+        margin-top: -5px;
+      }
+      img {
+        width: 32px;
+        height: 32px;
+        position: absolute;
+        top: 8px;
+        left: 12px;
+      }
+    }
   }
 }
 .toggle {

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/router/performance.js

@@ -13,6 +13,9 @@ export default [
       {
         path: 'delivery-detail',
         component: () => import('@/views/performance-manage/delivery-detail.vue'),
+        meta: {
+          path: '/gift-performance/delivery'
+        }
       },
       {
         path: 'refund',

src/router/real-gift.js

@@ -13,6 +13,9 @@ export default [
       {
         path: 'real-gift-detail',
         component: () => import('@/views/gift-manage/real-gift-detail.vue'),
+        meta: {
+          path: '/gift-manage/real-gift'
+        }
       },
       // 库存记录
       {

src/router/virtual-gift.js

@@ -13,6 +13,9 @@ export default [
       {
         path: 'virtual-gift-detail',
         component: () => import('@/views/gift-manage/virtual-gift-detail.vue'),
+        meta: {
+          path: '/gift-manage/virtual-gift'
+        }
       },
       // 库存记录
       {

src/store/index.js

@@ -19,9 +19,13 @@ export default new Vuex.Store({
     menu: {}, // 对应mapping里的值
     extraHideLeft: '', // 特殊页面控制 asidemenu显示隐藏   为hide的时候隐藏 其余不起作用，按照原本的moduleCode里的showLeft控制
     mainHeight: 0, // main的高度
-    routePath: []
+    routePath: [],
+    showCornerCanUseApp: false // 右下角弹出可用app列表
   },
   mutations: {
+    updateShowCornerCanUseApp(state, showCornerCanUseApp) {
+      state.showCornerCanUseApp = showCornerCanUseApp;
+    },
     updateRoutePath(state, routePath) {
       state.routePath = routePath;
     },

src/views/card/card-package/form.vue

@@ -37,7 +37,7 @@
         <el-tooltip content="若添加的卡券为固定有效期，仅允许添加和有效期限时间重合的卡券" placement="bottom" slot="label" open-delay="200">
           <span class="tooltip-icon">添加卡券</span>
         </el-tooltip>
-        <el-button class="dashed" :disabled="couponList.length > 10" @click="showSelector = true">添加卡券 {{ couponList.length }}/{{ 10 }}</el-button>
+        <el-button class="dashed" :disabled="couponList.length >= 10" @click="showSelector = true">添加卡券 {{ couponList.length }}/{{ 10 }}</el-button>
         <div class="imitation-table mt20" v-if="couponList.length" style="width:100%;" v-loading="cardLoading">
           <el-row class="thead">
             <el-col :span="5">卡券名称</el-col>
@@ -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,
@@ -224,7 +227,7 @@ export default {
         this.cardLoading = false;
       });
     },
-    getInfo() {
+    getInfo(showTip = false) {
       this.loading = true;
       getPackageDetail({ couponPackageId: this.couponPackageId }).then(res => {
         this.loading = false;
@@ -240,6 +243,9 @@ export default {
         this.stockType = info.stockUseType == 2 ? [ 0, 1 ] : [ info.stockUseType ] ;
         this.dateTime = [ info.beginDate, info.endDate ];
         this.couponList = res.result.couponList || [];
+        if(showTip && this.couponList.map(v => v.welfareStatus == 1).length < 2) {
+          this.$tips({ message: '卡券包中至少包含2张状态为已生效的卡券', type: 'warning' });
+        }
         if (info.operAuthType == 2) {
           this.ruleForm.operAuth = info.operAuth.split(',');
         }
@@ -268,6 +274,9 @@ export default {
           addPackages(params).then(res => {
             this.loading = false;
             this.$tips({ message: `${ this.isAdd ? '新建' : '编辑' }成功`, type: 'success' });
+            if(this.isAdd) {
+              this.$store.commit('updateShowCornerCanUseApp', true);
+            }
             if(!this.isAdd) {
               this.$router.push('/card-package/list');
             } else {
@@ -298,7 +307,7 @@ export default {
       };
       this.loading = true;
       editPackages(params).then(res => {
-        this.getInfo();
+        this.getInfo(true);
         this.loading = false;
       }).catch(() => {
         this.loading = false;
@@ -333,8 +342,8 @@ export default {
     params() {
       return {
         memberCardId: this.currentAreaId,
-        startCreateTime: formatDateTimeByType(this.dateTime[0], 'yyyy-MM-dd'),
-        endCreateTime: formatDateTimeByType(this.dateTime[1], 'yyyy-MM-dd'),
+        effectStartTime: formatDateTimeByType(this.dateTime[0], 'yyyy-MM-dd'),
+        effectEndTime: formatDateTimeByType(this.dateTime[1], 'yyyy-MM-dd'),
         minRemainedStock: this.ruleForm.packageStock
       };
     },

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>
@@ -90,20 +90,16 @@
           </el-tooltip>
         </template>
         <template slot-scope="scope">
-          <template v-if="scope.row.totalCouponSize < 2">
-            <span class="state-point state-point-warning">未生效</span>
-          </template>
-          <template v-else>
-            <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>
-          </template>
+          <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>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="left" width="180px" fixed="right">
         <template slot-scope="scope">
-          <dm-perm-button type="text" @click="$router.push(`/card-package/edit?id=${scope.row.couponPackageId}`)">编辑</dm-perm-button>
-          <dm-perm-button type="text" @click="$router.push(`/card-package/send-list?id=${scope.row.couponPackageId}`)" class="mr20">发放记录</dm-perm-button>
+          <dm-perm-button type="text" v-if="scope.row.useStatus != 2" @click="$router.push(`/card-package/edit?id=${scope.row.couponPackageId}`)">编辑</dm-perm-button>
+          <!-- statusFlag 1正常（生效状态），0卡券张数不正常(失效状态) -->
+          <el-button v-if="!(scope.row.useStatus == 2 && scope.row.statusFlag == 0)" type="text" @click="$router.push(`/card-package/send-list?id=${scope.row.couponPackageId}`)">发放记录</el-button>
           <el-popover popper-class="option-dropdown" trigger="hover">
             <ul>
               <li>
@@ -113,7 +109,7 @@
                 <dm-perm-button @click="delOne(scope.row)" :disabld="$itemPerm($itemCode.gicDeletePackage)" type="text">删除</dm-perm-button>
               </li>
             </ul>
-            <el-button type="text" slot="reference"><i class="el-icon-more"></i></el-button>
+            <el-button :class="{'ml20': !(scope.row.useStatus == 2 && scope.row.statusFlag == 0)}" type="text" slot="reference"><i class="el-icon-more"></i></el-button>
           </el-popover>
         </template>
       </el-table-column>

src/views/card/gic-card/card-form.js

@@ -841,6 +841,7 @@ export default {
         this.result.visible = true;
         this.submitType = 1;
         this.loading = false;
+        this.$store.commit('updateShowCornerCanUseApp', true);
       }).catch(() => {
         this.loading = false;
       });
@@ -880,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/destory-list.vue

@@ -130,7 +130,9 @@ export default {
     this.$emit('updateBread', [ { breadName: '福利中心' }, { breadName: 'GIC卡券销毁列表' } ]);
   },
   mounted() {
-    this.getTableList();
+    if(this.currentAreaId) {
+      this.getTableList();
+    }
   },
   methods: {
     showDialog(type, destoryItem) {

src/views/card/gic-card/module/destory-dialog.vue

@@ -4,9 +4,8 @@
       <el-alert class="mb10" title="卡券销毁将不可撤回，请谨慎操作" type="warning" show-icon :closable="false"></el-alert>
       <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="130px" class="pt20">
         <el-form-item label="选择卡券" prop="couponId">
-          {{ ruleForm.couponId }}
           <!-- 只有卡券销毁处传isDestory这个参数 -->
-          <!-- <dm-card-select v-if="show" ref="cardSelect" class="cardSelect" :member-card-id="currentAreaId" @selectData="selectData" fix-member-card is-destory /> -->
+          <dm-card-select v-if="show" ref="cardSelect" class="cardSelect" :member-card-id="currentAreaId" @selectData="selectData" fix-member-card />
         </el-form-item>
         <el-form-item label="销毁方式" prop="destroyMode">
           <el-radio-group :disabled="type !== 'add'" v-model="ruleForm.destroyMode">

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/check-upload-detail.vue

@@ -5,7 +5,7 @@
         <div v-html="template" style="font-size:12px;line-height:22px"></div>
       </div>
       <div>
-        <el-input placeholder="请输入关键词搜索" prefix-icon="el-icon-search" v-model="search" class="mr10 w220" clearable @keyup.enter.native="getSearchList" @clear="getSearchList"></el-input>
+        <el-input placeholder="请输入关键词搜索" prefix-icon="el-icon-search" v-model="search" class="mr10 w220" clearable @keyup.enter.native="getTableList" @clear="getTableList"></el-input>
       </div>
       <el-table :data="tableData" class="mt20">
         <el-table-column label="卡号" prop="paramOne"></el-table-column>
@@ -52,7 +52,8 @@ export default {
       pageSize: 10,
       total: '',
       tableData: [],
-      template: ''
+      template: '',
+      search: ''
     };
   },
   mounted() {
@@ -69,7 +70,7 @@ export default {
       this.loading = true;
       let params = {
         id: this.giftId,
-        key: '',
+        key: this.search,
         pageSize: this.pageSize,
         currentPage: this.currentPage
       };

src/views/gift-manage/module/select-pickup-store.vue

@@ -80,7 +80,7 @@
         </p>
         <p class="pickup-list-total">
           成功<span class="pickup-list-success">{{ uploadFile.successNum || 0 }}</span>个，失败<span class="pickup-list-error">{{ uploadFile.errorNum || 0 }}</span>个。
-          <el-button type="text" @click="showErrorList = true">查看失败原因</el-button>
+          <el-button type="text" v-if="uploadFile.errorNum" @click="showErrorList = true">查看失败原因</el-button>
         </p>
       </div>
     </div>

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="批量编辑">
@@ -136,6 +136,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.toFixed(2);
+          }
           if (this.goodsStandardInfo.length > 0) {
             this.isStdImg = this.goodsStandardInfo[0].standardimg === 2 ? true : false;
           } else {
@@ -205,7 +208,7 @@ export default {
       for (let item of goodsSkuListCopy) {
         if (skuSellObjCopy[item.mapId]) {
           this.skuSellObj[item.mapId] = {
-            giftSkuCostPrice: Object.keys(skuSellObjCopy).length > 0 ? skuSellObjCopy[item.mapId].giftSkuCostPrice : '',
+            giftSkuCostPrice: Object.keys(skuSellObjCopy).length > 0 ? skuSellObjCopy[item.mapId].giftSkuCostPrice.toFixed(2) : '',
             stock: Object.keys(skuSellObjCopy).length > 0 ? skuSellObjCopy[item.mapId].stock : '',
             giftSkuCode: Object.keys(skuSellObjCopy).length > 0 ? skuSellObjCopy[item.mapId].giftSkuCode : '',
             skuBarCode: Object.keys(skuSellObjCopy).length > 0 ? skuSellObjCopy[item.mapId].skuBarCode : '',
@@ -228,6 +231,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 +303,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,18 +12,18 @@
             </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>
                     <el-option label="减少" :value="0"></el-option>
                   </el-select>
-                  <dm-input-number v-model="banthStock" width="140" style="margin-left:-2px;" controls-position="right" precision="2" :min="0" :max="999999.99"></dm-input-number>
+                  <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="批量编辑">
@@ -36,7 +36,7 @@
                 <el-option label="增加" :value="1"></el-option>
                 <el-option label="减少" :value="0"></el-option>
               </el-select>
-              <dm-input-number v-model="skuSellObj[scope.row.mapId].stageStock" width="140" style="margin-left:-2px;" controls-position="right" @blur="changeSingleStock(skuSellObj[scope.row.mapId].giftSkuId, skuSellObj[scope.row.mapId].stageStock, skuSellObj[scope.row.mapId].stockType)" precision="2" :min="0" :max="999999.99"></dm-input-number>
+              <dm-input-number v-model="skuSellObj[scope.row.mapId].stageStock" width="140" style="margin-left:-2px;" controls-position="right" @blur="changeSingleStock(skuSellObj[scope.row.mapId].giftSkuId, skuSellObj[scope.row.mapId].stageStock, skuSellObj[scope.row.mapId].stockType)" precision="0" :min="0" :max="999999"></dm-input-number>
             </template>
           </el-table-column>
         </el-table>
@@ -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="2" :min="0" :max="999999.99"></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/module/update-virtual-cost.vue

@@ -50,7 +50,7 @@ export default {
   mounted() {
     this.dialogVisible = true;
     this.giftId = this.updateCostData.id;
-    this.costPrice = this.updateCostData.maxCostPrice;
+    this.costPrice = this.updateCostData.costPrice;
   },
   methods: {
     submitProNanme() {

src/views/gift-manage/module/update-virtual-stock.vue

@@ -6,7 +6,7 @@
           <div class="pickup-upload">
             <div>
               <span class="file-style inline-block" style="position:relative">
-                <input style="position:absolute;top:3px;opacity:0;" type="file" name="file" accept=".xlsx,.xls" ref="file" @change="change">
+                <input style="position:absolute;top:3px;opacity:0;width:70px" type="file" name="file" accept=".xlsx,.xls" ref="file" @change="change">
                 <el-button class="upload-trigger" @click="upload"><i class="iconfont-components4 icon-cp-shangc upload-icon"></i> 上传</el-button>
               </span>
               <span class="upload-tip inline-block">

src/views/gift-manage/pickup-list.vue

@@ -37,9 +37,10 @@
 
 <script>
 import { page } from '@/mixins/table.js';
-import fetch, { exportPickupStoreExcel } from '@/api/gift.js';
+// import fetch, { exportPickupStoreExcel } from '@/api/gift.js';
+import fetch from '@/api/gift.js';
 import pickupUpdateDialog from './module/pickup-update-dialog';
-const { pickupList, delPickup } = fetch;
+const { pickupList, delPickup, exportPickup } = fetch;
 export default {
   name: 'PickupList',
   components: { pickupUpdateDialog },
@@ -71,9 +72,17 @@ export default {
   },
   methods: {
     exportExcel() {
-      exportPickupStoreExcel;
+      // exportPickupStoreExcel;
       // window.location = exportPickupStoreExcel + `?dataUrl=/welfare/setting/pickup-list&name=${this.listParams.name}`;
-      window.location = `https://four.gicdev.com/api-welfare/export-pickup-store-excel?dataUrl=/welfare/setting/pickup-list&name=${this.listParams.name}`;
+      // window.location = `https://four.gicdev.com/api-welfare/export-pickup-store-excel?dataUrl=/welfare/setting/pickup-list&name=${this.listParams.name}`;
+      let params = {
+        dataUrl: '/welfare/setting/pickup-list',
+        name: this.listParams.name
+      };
+      exportPickup(params).then(res =>{
+        window.location.href = window.location.origin + '/damo-system/report-list';
+        // window.location.href = 'https://four.gicdev.com/damo-system/report-list';
+      });
     },
     mutiUpdate() {
       this.selectList = [];

src/views/gift-manage/real-gift.vue

@@ -5,7 +5,7 @@
         <div>
           <div class="tab-top">
             <div class="fl">
-              <el-input :placeholder="placeholderText" v-model="query.key" class="mr10 w360" clearable @keyup.enter.native="getSearchList" @clear="getSearchList">
+              <el-input :placeholder="placeholderText" v-model="query.key" class="mr10 w360" clearable @keyup.enter.native="getSearchList" @clear="getSearchList2">
                 <el-select v-model="query.type" slot="prepend" placeholder="礼品名称" style="width:140px;" @change="handleChangeType">
                   <el-option label="礼品名称" :value="1"></el-option>
                   <el-option label="礼品编码" :value="2"></el-option>
@@ -92,8 +92,8 @@
             <el-table-column prop="costPrice" label="成本" sortable="custom" min-width="150px">
               <template slot-scope="scope">
                 <p class="stock-box">
-                  <span v-if="scope.row.minCostPrice == scope.row.maxCostPrice">{{ scope.row.minCostPrice }}</span>
-                  <span v-else>{{ scope.row.minCostPrice }}-{{ scope.row.maxCostPrice }}</span>
+                  <span v-if="scope.row.minCostPrice == scope.row.maxCostPrice">{{ scope.row.minCostPrice.toFixed(2) }}</span>
+                  <span v-else>{{ scope.row.minCostPrice.toFixed(2) }}-{{ scope.row.maxCostPrice.toFixed(2) }}</span>
                   <i class="el-icon-edit-outline inline-block ml5" @click="updateCost(scope.row)"></i>
                 </p>
               </template>
@@ -126,7 +126,7 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column prop="allExchangeNumber" label="总出库量" min-width="100px">
+            <el-table-column prop="totalStock" label="总出库量" min-width="100px">
               <template slot="header">
                 <el-tooltip open-delay="200" effect="dark" style="width:250px" placement="top">
                   <span class="undeline-dash">总出库量</span>
@@ -139,7 +139,7 @@
                 </el-tooltip>
               </template>
               <template slot-scope="scope">
-                <span>{{ scope.row.historyTotalStock }}</span>
+                <span>{{ scope.row.totalOutStock || '--' }}</span>
               </template>
             </el-table-column>
             <el-table-column prop="hiddenFlag" label="是否隐藏" min-width="100px">
@@ -280,6 +280,11 @@ export default {
       this.query.currentPage = 1;
       this.getTableList();
     },
+    getSearchList2() {
+      this.query.type = 1;
+      this.query.currentPage = 1;
+      this.getTableList();
+    },
     // 列表筛选条件更改
     handleChangeType() {
       if (this.query.type === 1) {
@@ -566,6 +571,7 @@ export default {
       this.stockData.remainedStock = '';
       this.stockData.textarea = '';
       this.StockDialog = false;
+      this.getTableList();
     },
     // 更新成本
     updateCost(item) {

src/views/gift-manage/virtual-gift.vue

@@ -5,7 +5,7 @@
         <div>
           <div class="tab-top">
             <div class="fl">
-              <el-input :placeholder="placeholderText" v-model="query.key" class="mr10 w360" clearable @keyup.enter.native="getSearchList" @clear="getSearchList">
+              <el-input :placeholder="placeholderText" v-model="query.key" class="mr10 w360" clearable @keyup.enter.native="getSearchList" @clear="getSearchList2">
                 <el-select v-model="query.type" slot="prepend" placeholder="礼品名称" style="width:140px;" @change="handleChangeType">
                   <el-option label="礼品名称" :value="1"></el-option>
                   <el-option label="礼品编码" :value="2"></el-option>
@@ -92,8 +92,8 @@
             <el-table-column prop="costPrice" label="成本" sortable="custom" min-width="150px">
               <template slot-scope="scope">
                 <p class="stock-box">
-                  <span v-if="scope.row.minCostPrice == scope.row.maxCostPrice">{{ scope.row.minCostPrice }}</span>
-                  <span v-else>{{ scope.row.minCostPrice }}-{{ scope.row.maxCostPrice }}</span>
+                  <span v-if="scope.row.minCostPrice == scope.row.maxCostPrice">{{ scope.row.minCostPrice.toFixed(2) }}</span>
+                  <span v-else>{{ scope.row.minCostPrice.toFixed(2) }}-{{ scope.row.maxCostPrice.toFixed(2) }}</span>
                   <i class="el-icon-edit-outline" @click="updateCost(scope.row)"></i>
                 </p>
               </template>
@@ -139,7 +139,7 @@
                 </el-tooltip>
               </template>
               <template slot-scope="scope">
-                <span>{{ scope.row.historyTotalStock }}</span>
+                <span>{{ scope.row.totalOutStock || '--' }}</span>
               </template>
             </el-table-column>
             <el-table-column prop="hiddenFlag" label="是否隐藏" min-width="100px">
@@ -256,7 +256,7 @@ export default {
       selectList: [],
       // 更新成本数据
       updateCostData: {
-        costPrice: '',
+        maxCostPrice: '',
         id: '',
         textarea: ''
       },
@@ -292,7 +292,10 @@ export default {
   created() {
     this.$emit('updateBread', this.bread);
     this.$emit('showAside', true);
-    this.query.giftId = this.$route.query.giftId;
+    if(this.$route.query.giftId){
+      this.query.key = this.$route.query.giftId;
+      this.query.type = 0;
+    }
     this.init();
   },
   methods: {
@@ -302,7 +305,12 @@ export default {
       this.getTableList();
     },
     getSearchList() {
-      this.currentPage = 1;
+      this.query.currentPage = 1;
+      this.getTableList();
+    },
+    getSearchList2() {
+      this.query.type = 1;
+      this.query.currentPage = 1;
       this.getTableList();
     },
     // 列表筛选条件更改
@@ -408,8 +416,10 @@ export default {
       }
       if (value.prop === 'updateTime') {
         this.query.sortColumn = 'update_time';
-      } else if (value.prop === 'costPrice') {
-        this.query.sortColumn = 'cost_price';
+      } else if (value.prop === 'costPrice' && value.order == 'ascending') {
+        this.query.sortColumn = 'min_cost_price';
+      } else if (value.prop === 'costPrice' && value.order == 'descending') {
+        this.query.sortColumn = 'min_cost_price';
       } else if (value.prop === 'stock') {
         this.query.sortColumn = 'stock';
       }
@@ -639,7 +649,7 @@ export default {
     // 更新成本
     updateCost(item) {
       this.updateCostData.id = item.giftId;
-      this.updateCostData.maxCostPrice = item.costPrice;
+      this.updateCostData.costPrice = item.maxCostPrice.toFixed(2);
       this.updateCostDialog = true;
     },
     closeUpdateCost() {

src/views/performance-manage/delivery-detail.vue

@@ -137,7 +137,7 @@ export default {
       },
       {
         breadName: '发货单',
-        breadPath: '/performance/delivery',
+        breadPath: '/gift-performance/delivery',
       },
       {
         breadName: '发货单详情'

src/views/performance-manage/delivery-list.vue

@@ -289,7 +289,7 @@ export default {
       this.activeDialog = dialogName;
     },
     linkToDetail(row) {
-      this.$router.push({ path: '/performance/delivery-detail', query: { deliveryId: row.deliveryId } });
+      this.$router.push({ path: '/gift-performance/delivery-detail', query: { deliveryId: row.deliveryId } });
     },
     handleExport(config) {
       let listParams = {

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">