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

# Conflicts:
#	dist/index.html
#	dist/js/card-package~gic-card.3e51a06e.js
#	dist/js/card-package~gic-card.48fa4ecc.js
#	dist/js/card-package~gic-card.8bf9465d.js
#	dist/js/chunk-04491343.907f7e81.js
#	dist/js/chunk-0ed85f5a.e5e7657f.js
#	dist/js/chunk-5d5bbb0f.2891eba7.js
#	dist/js/chunk-6287d3af.b334e536.js
#	dist/js/chunk-6287d3af.e3fbaa92.js
#	dist/js/chunk-6287d3af.e76d1a8d.js
#	dist/js/chunk-9b9ebe6a.dc44d7ae.js
#	dist/js/chunk-b5001a50.3fede0f8.js
#	dist/js/chunk-cc768a6e.e9471314.js
#	dist/js/chunk-ce92d9b2.d94a1c58.js

dist/css/chunk-04491343.a650015d.css

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

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

+.w-280[data-v-34e78e1e]{width:280px}
\ No newline at end of file

dist/css/chunk-5d5bbb0f.7a2343bb.css

-.w-480[data-v-2c5a0676]{width:480px}
\ No newline at end of file

dist/css/chunk-61c2b66a.5666394a.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-6a22527c]{border-color:#1890ff}.upload-ele .el-button[data-v-6a22527c]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-6a22527c]{padding:0}.uploadText p[data-v-6a22527c]{line-height:26px}.upload-tip-text[data-v-6a22527c]{font-size:12px;color:#303133}.pickup-upload[data-v-6a22527c]{display:inline-block;vertical-align:top}.pickup-upload .upload-trigger[data-v-6a22527c]{border-style:dashed;margin-right:10px}.pickup-upload .upload-trigger .upload-icon[data-v-6a22527c]{font-size:14px}.pickup-upload .pickup-list[data-v-6a22527c]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-6a22527c]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-6a22527c]{font-size:14px}.w360[data-v-1aa83d5a]{width:360px}.w-160[data-v-1aa83d5a]{width:160px}.w140[data-v-1aa83d5a]{width:140px}.w350[data-v-1aa83d5a]{width:350px}.mr4[data-v-1aa83d5a]{margin-right:4px}.tab-top[data-v-1aa83d5a]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-1aa83d5a],.tab-top[data-v-1aa83d5a]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-1aa83d5a]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-1aa83d5a]{height:60px}.table-content .img-text img[data-v-1aa83d5a]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-1aa83d5a]{display:inline-block;vertical-align:top;width:74%;height:60px;margin-left:10px;font-size:13px;line-height:14px;position:relative}.table-content .img-text .text .goods-descript[data-v-1aa83d5a]{display:-webkit-box;display:-ms-flexbox;display:flex;color:#303133;line-height:22px;font-size:14px}.table-content .img-text .text .goods-code[data-v-1aa83d5a]{color:#909399;font-size:12px;line-height:16px;margin-bottom:2px}.table-content .img-text .el-icon-edit-outline[data-v-1aa83d5a]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-1aa83d5a]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-1aa83d5a]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-1aa83d5a]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-1aa83d5a]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-1aa83d5a]:hover{color:#2f54ed}.undeline-dash[data-v-1aa83d5a]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-1aa83d5a]{display:inline-block;line-height:32px}.hidden-data[data-v-1aa83d5a]{max-width:220px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.stock-box .el-tooltip__popper{width:150px}.popver-button .cancle-button:hover{color:#2f54eb;border-color:#2f54eb;background-color:#fff}
\ No newline at end of file

dist/css/chunk-9b9ebe6a.47af1273.css

-.w-280[data-v-2890cc04]{width:280px}.w600[data-v-51f73c4f]{width:600px}.title[data-v-51f73c4f]{height:40px;line-height:40px;background:#f7f8fa}.title[data-v-51f73c4f]:before{clear:both;content:"";display:inline-block;overflow:hidden;width:3px;height:12px;line-height:14px;margin-right:8px;background:#2f54eb}
\ No newline at end of file

dist/css/chunk-a144d7ae.855b4e1e.css

+.w-480[data-v-dda3d4b6]{width:480px}.w-360[data-v-dda3d4b6]{width:360px}.special .el-checkbox__input.is-checked+.el-checkbox__label{color:#c4c6cf}
\ No newline at end of file

dist/css/chunk-a8581e8a.4f5f3357.css

+.w-280[data-v-34e78e1e]{width:280px}.w600[data-v-97ff8a76]{width:600px}.w-360[data-v-97ff8a76]{width:360px}.title[data-v-97ff8a76]{height:40px;line-height:40px;background:#f7f8fa}.title[data-v-97ff8a76]:before{clear:both;content:"";display:inline-block;overflow:hidden;width:3px;height:12px;line-height:14px;margin-right:8px;background:#2f54eb}.w-106[data-v-97ff8a76]{width:106px}.padding-change .el-input__inner{padding-right:10px!important}.special .el-checkbox__input.is-checked+.el-checkbox__label{color:#c4c6cf}
\ No newline at end of file

dist/css/chunk-b5001a50.96e5a474.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-6a22527c]{border-color:#1890ff}.upload-ele .el-button[data-v-6a22527c]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-6a22527c]{padding:0}.uploadText p[data-v-6a22527c]{line-height:26px}.upload-tip-text[data-v-6a22527c]{font-size:12px;color:#303133}.pickup-upload[data-v-6a22527c]{display:inline-block;vertical-align:top}.pickup-upload .upload-trigger[data-v-6a22527c]{border-style:dashed;margin-right:10px}.pickup-upload .upload-trigger .upload-icon[data-v-6a22527c]{font-size:14px}.pickup-upload .pickup-list[data-v-6a22527c]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-6a22527c]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-6a22527c]{font-size:14px}.w360[data-v-4c2dc15a]{width:360px}.w-160[data-v-4c2dc15a]{width:160px}.w140[data-v-4c2dc15a]{width:140px}.w350[data-v-4c2dc15a]{width:350px}.mr4[data-v-4c2dc15a]{margin-right:4px}.tab-top[data-v-4c2dc15a]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-4c2dc15a],.tab-top[data-v-4c2dc15a]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-4c2dc15a]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-4c2dc15a]{height:60px}.table-content .img-text img[data-v-4c2dc15a]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-4c2dc15a]{display:inline-block;vertical-align:top;width:74%;height:60px;margin-left:10px;font-size:13px;line-height:14px;position:relative}.table-content .img-text .text .goods-descript[data-v-4c2dc15a]{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-4c2dc15a]{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-4c2dc15a]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-4c2dc15a]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-4c2dc15a]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-4c2dc15a]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-4c2dc15a]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-4c2dc15a]:hover{color:#2f54ed}.undeline-dash[data-v-4c2dc15a]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-4c2dc15a]{display:inline-block;line-height:32px}.hidden-data[data-v-4c2dc15a]{max-width:220px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.stock-box .el-tooltip__popper{width:150px}.popver-button .cancle-button:hover{color:#2f54eb;border-color:#2f54eb;background-color:#fff}
\ No newline at end of file

dist/css/chunk-b8184622.1cc10969.css

+.ml8[data-v-5f8a1d3e]{margin-left:8px}.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}.right-border[data-v-57979004]{border-right:1px solid #ebeef5}.ml8[data-v-57979004]{margin-left:8px}.batch-style{border-radius:4px;padding:5px!important}.popver-button .el-button{min-width:auto!important;vertical-align:top;line-height:22px;padding:0 5px;font-size:12px}.el-button.cancel-style:hover,.popver-button .el-button.cancel-style:focus{color:#2f54eb!important;border-color:#2f54eb!important;background-color:#fff!important}.w360[data-v-5eff879d]{width:360px}.w-160[data-v-5eff879d]{width:160px}.w140[data-v-5eff879d]{width:140px}.w350[data-v-5eff879d]{width:350px}.mr4[data-v-5eff879d]{margin-right:4px}.tab-top[data-v-5eff879d]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-5eff879d],.tab-top[data-v-5eff879d]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-5eff879d]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-5eff879d]{height:60px}.table-content .img-text img[data-v-5eff879d]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-5eff879d]{display:inline-block;vertical-align:top;width:74%;height:60px;margin-left:10px;font-size:13px;line-height:14px;position:relative}.table-content .img-text .text .goods-descript[data-v-5eff879d]{display:-webkit-box;display:-ms-flexbox;display:flex;color:#303133;line-height:22px;font-size:14px}.table-content .img-text .text .goods-code[data-v-5eff879d]{color:#909399;font-size:12px;line-height:16px;margin-bottom:2px}.table-content .img-text .el-icon-edit-outline[data-v-5eff879d]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-5eff879d]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-5eff879d]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-5eff879d]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-5eff879d]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-5eff879d]:hover{color:#2f54ed}.undeline-dash[data-v-5eff879d]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-5eff879d]{display:inline-block;line-height:32px}.hidden-data[data-v-5eff879d]{max-width:220px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.stock-box .el-tooltip__popper{width:150px}.popver-button .cancle-button:hover{color:#2f54eb;border-color:#2f54eb;background-color:#fff}
\ No newline at end of file

dist/css/chunk-cc768a6e.a6cd210f.css

-.w-280[data-v-2890cc04]{width:280px}
\ No newline at end of file

dist/css/chunk-ce92d9b2.16599cd3.css

-.ml8[data-v-5a5d66fc]{margin-left:8px}.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}.right-border[data-v-7a978890]{border-right:1px solid #ebeef5}.ml8[data-v-7a978890]{margin-left:8px}.batch-style{border-radius:4px;padding:5px!important}.w360[data-v-329b6049]{width:360px}.w-160[data-v-329b6049]{width:160px}.w140[data-v-329b6049]{width:140px}.w350[data-v-329b6049]{width:350px}.mr4[data-v-329b6049]{margin-right:4px}.tab-top[data-v-329b6049]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-329b6049],.tab-top[data-v-329b6049]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-329b6049]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-329b6049]{height:60px}.table-content .img-text img[data-v-329b6049]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-329b6049]{display:inline-block;vertical-align:top;width:74%;height:60px;margin-left:10px;font-size:13px;line-height:14px;position:relative}.table-content .img-text .text .goods-descript[data-v-329b6049]{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-329b6049]{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-329b6049]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-329b6049]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-329b6049]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-329b6049]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-329b6049]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-329b6049]:hover{color:#2f54ed}.undeline-dash[data-v-329b6049]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-329b6049]{display:inline-block;line-height:32px}.hidden-data[data-v-329b6049]{max-width:220px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.stock-box .el-tooltip__popper{width:150px}.popver-button .cancle-button:hover{color:#2f54eb;border-color:#2f54eb;background-color:#fff}
\ No newline at end of file

public/index.html

@@ -42,7 +42,7 @@
     <script src="//web-1251519181.file.myqcloud.com/components/pagination.1.0.10.js"></script><!-- 分页器 -->
     <script src="//web-1251519181.file.myqcloud.com/components/perm-button.1.0.1.js"></script><!-- 权限项按钮 -->
     <script src="//web-1251519181.file.myqcloud.com/components/steps.1.0.1.js"></script><!-- 步骤条 -->
-    <script src="//web-1251519181.file.myqcloud.com/components/upload-picture.1.0.6.js"></script><!-- 图片上传 -->
+    <script src="//web-1251519181.file.myqcloud.com/components/upload-picture.1.0.7.js"></script><!-- 图片上传 -->
     <script src="//web-1251519181.file.myqcloud.com/components/upload-file.1.0.6.js"></script><!-- 文件上传 -->
     <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.4.js"></script><!-- 图片预览 -->

src/components/stock-list/index.vue

@@ -8,7 +8,7 @@
       <p class="fray01 fw500 mb15">操作记录<span class="fz12 ml15 gray03 fw400">主要对手动调整库存，应用占用库存，应用释放库存的场景下对福利“可占库存”引起变更进行记录</span></p>
       <div class="mb20">
         <el-select class="mr10 w160" v-if="type == 1" clearable v-model="listParams.welfareSkuId" placeholder="全部SKU" @change="refresh">
-          <el-option v-for="(item, idx) in skuList" :key="idx" :label="item.giftSkuName" :value="item.giftSkuId"></el-option>
+          <el-option v-for="(item, idx) in skuList" :title="item.giftSkuName" :key="idx" :label="item.giftSkuName" :value="item.giftSkuId"></el-option>
         </el-select>
         <el-select class="mr10 w160" clearable v-model="listParams.modifyType" placeholder="所有类型" @change="refresh">
           <el-option v-for="item in stockAdjustType" :key="item.value" :label="item.label" :value="item.value"></el-option>

src/utils/common.js

@@ -188,11 +188,11 @@ export const getSeconds = (time) => {
   if (!isNaN(time)) time = Number(time);
   let now = new Date(time);
   let hour = now.getHours();
-  hour >= 10 && (hour = '0' + hour); // 判断小于10的时的情况
+  hour < 10 && (hour = '0' + hour); // 判断小于10的时的情况
   let minute = now.getMinutes();
-  minute >= 10 && (minute = '0' + minute); // 判断小于10的分的情况
+  minute < 10 && (minute = '0' + minute); // 判断小于10的分的情况
   let second = now.getSeconds();
-  second >= 10 && (second = '0' + second); // 判断小于10的秒的情况
+  second < 10 && (second = '0' + second); // 判断小于10的秒的情况
   return hour + ':' + minute + ':' + second;
 };
 

src/views/gift-manage/address-lib-form.vue

 <template>
   <div class="p20">
     <el-form ref="ruleForm" :model="ruleForm" label-width="120px" :rules="rules" style="width:600px;">
-      <el-form-item prop="type" label="地址类型">
-        <el-radio-group v-model="ruleForm.type">
-        <el-radio :label="1">退货地址</el-radio>
-      </el-radio-group>
-      </el-form-item>
-      <el-form-item prop="defaultFlag" label="是否默认">
-        <el-switch :active-value="1" :inactive-value="0" v-model="ruleForm.defaultFlag"></el-switch>
-      </el-form-item>
       <el-form-item prop="contact" label="联系人">
-        <el-input v-model="ruleForm.contact" :maxlength="20" show-word-limit placeholder="请输入联系人姓名"></el-input>
+        <el-input v-model="ruleForm.contact" class="w-360" :maxlength="20" show-word-limit placeholder="请输入联系人姓名"></el-input>
       </el-form-item>
-      <el-form-item prop="phone" label="手机号">
+      <el-form-item prop="phone" label="联系方式">
         <!-- <dm-input-phone style="width:100%;" v-model="ruleForm.phone" show-word-limit></dm-input-phone> -->
-        <el-input v-model="ruleForm.phone" type="text" class="w-480" placeholder="请输入手机号">
-          <el-select v-model="areaCode" slot="prepend" placeholder="请选择" style="width:90px">
+        <el-input v-model="ruleForm.phone" type="text" class="w-360" placeholder="请输入手机号码">
+          <el-select v-model="areaCode" slot="prepend" placeholder="请选择" style="width:100px">
             <el-option :label="`+` + `${item.code}`" :value="item.code" v-for="(item, index) in areaCodeList" :key="index"></el-option>
           </el-select>
         </el-input>
       </el-form-item>
-      <el-form-item label="电话">
-        <el-input v-model="tel1" :maxlength="20" style="width:120px;" placeholder="请填写区号"></el-input><span class="ml5 mr5 gray02">-</span>
-        <el-input v-model="tel2" :maxlength="20" style="width:120px;" placeholder="请填写座机号"></el-input><span class="ml5 mr5 gray02">-</span>
-        <el-input v-model="tel3" :maxlength="20" style="width:120px;" placeholder="请填写分机号"></el-input>
+      <el-form-item label="座机号">
+        <el-input v-model="tel1" :maxlength="20" class="mr10" style="width:106px;" placeholder="区号"></el-input>
+        <el-input v-model="tel2" :maxlength="20" class="mr10" style="width:128px;" placeholder="座机号"></el-input>
+        <el-input v-model="tel3" :maxlength="20" style="width:106px;" placeholder="分机号(选填)"></el-input>
       </el-form-item>
-      <el-form-item label="所在地区">
-        <el-cascader v-model="cityIds" style="width:100%;" :options="cityList" @change="change"></el-cascader>
+      <el-form-item label="所在地区" prop="cityIds">
+        <el-cascader v-model="cityIds" style="width:360px;" placeholder="请选择省/市/区" :options="cityList" @change="change"></el-cascader>
       </el-form-item>
       <el-form-item prop="address" label="详细地址">
-        <el-input type="textarea" placeholder="请不要重复填写省市区" v-model="ruleForm.address" :maxlength="50" show-word-limit></el-input>
+        <el-input type="textarea" class="w-360" placeholder="请输入详细地址，如街道名称、门牌号等信息" v-model="ruleForm.address" :maxlength="50" show-word-limit></el-input>
+      </el-form-item>
+      <el-form-item prop="type" label="地址类型">
+        <el-checkbox v-model="type" disabled class="special">退货地址</el-checkbox>
+      </el-form-item>
+      <el-form-item prop="defaultFlag">
+        <el-checkbox v-model="flag" style="margin-left:20px;color:#303133" @change="changeFlag">设为默认退货地址</el-checkbox>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="submitForm()">{{ addressId ? '保存' : '确认新建' }}</el-button>
@@ -98,11 +96,13 @@ export default {
       },
       rules: {
         contact: [ { required: true, message: '联系人不能为空', trigger: 'blur' } ],
-        phone: [ { validator: phoneValidator, trigger: 'blur' } ],
+        phone: [ { required: true, validator: phoneValidator, trigger: 'blur' } ],
         cityIds: [ { required: true, validator: cityValidator, trigger: 'change' } ],
         address: [ { required: true, message: '详细地址不能为空', trigger: 'blur' } ],
         tel: [ { validator: telValidator, trigger: 'blur' } ],
       },
+      flag: false,
+      type: true,
       tel1: '',
       tel2: '',
       tel3: '',
@@ -123,6 +123,13 @@ export default {
       console.log(value);
       // this.cityIds;
     },
+    changeFlag(value){
+      if(value){
+        this.ruleForm.defaultFlag = 1;
+      }else{
+        this.ruleForm.defaultFlag = 0;
+      }
+    },
     submitForm() {
       this.$refs.ruleForm.validate((valid) => {
         if (!valid) {
@@ -193,4 +200,12 @@ export default {
 .w-480 {
   width: 480px;
 }
+.w-360{
+  width: 360px;
+}
+</style>
+<style>
+.special .el-checkbox__input.is-checked+.el-checkbox__label{
+  color: #c4c6cf;
+}
 </style>
\ No newline at end of file

src/views/gift-manage/module/check-upload-detail.vue

@@ -18,7 +18,7 @@
       </el-table>
       <div class="pagination-conteiner" style="background:#fff;" v-show="total > 0">
         <div class="pagination" style="text-align: right;">
-          <dm-pagination background small @current-change="getTableList" :current-page.sync="currentPage" :page-size="pageSize" layout="prev, pager, next" :total="total" v-if="total != 0"> </dm-pagination>
+          <dm-pagination small @current-change="getTableList" :current-page.sync="currentPage" :page-size="pageSize" layout="prev, pager, next" :total="total" v-if="total != 0"> </dm-pagination>
         </div>
       </div>
     </div>

src/views/gift-manage/module/pickup-form-content.vue

@@ -2,8 +2,8 @@
   <div>
     <el-form-item label="买家可选自提时间">
       <el-switch v-model="ruleForm.chooseTimeFlag" :active-value="1" :inactive-value="0"></el-switch>
-      <p style="font-size:12px;color:#909399">若不开启，则默认会员可在任意时间提货</p>
-      <p style="font-size:12px;color:#909399">若开启，表示买家可选择自提时间，商户需按约定时间备货完成</p>
+      <p style="font-size:12px;color:#909399">开启表示买家可选择自提时间，商户需按约定时间备货完成。</p>
+      <!-- <p style="font-size:12px;color:#909399">若开启，表示买家可选择自提时间，商户需按约定时间备货完成</p> -->
     </el-form-item>
     <template v-if="ruleForm.chooseTimeFlag">
       <el-form-item label="日期类型" required>
@@ -12,17 +12,17 @@
       </el-form-item>
       <el-form-item label="商品备货设置" v-if="ruleForm.dateType == 1" prop="dynamicType">
         <div class="mb5">
-          <el-radio v-model="ruleForm.dynamicType" :label="1">下单当天</el-radio>
-          <el-input-number class="w100 mr5" v-model="ruleForm.dynamicH" :min="1" :max="24" :controls="false" :precision="0"></el-input-number>小时，
-          <el-input-number class="w100 mr5" v-model="ruleForm.dynamicM" :max="60" :controls="false" :precision="0"></el-input-number>分钟后，买家可提货
+          <el-radio v-model="ruleForm.dynamicType" style="margin-right:10px" :label="1">下单当天</el-radio>
+          <el-input-number class="w100 mr10" v-model="ruleForm.dynamicH" :min="1" :max="24" :controls="false" :precision="0"></el-input-number>小时
+          <el-input-number class="w100 mr10 ml10" v-model="ruleForm.dynamicM" :max="60" :controls="false" :precision="0"></el-input-number>分钟后，买家可提货
         </div>
         <div>
-          <el-radio v-model="ruleForm.dynamicType" :label="2">下单&emsp;&emsp;</el-radio>
-          <el-input-number class="w100 mr5" v-model="ruleForm.dynamicD" :max="1000" :controls="false" :precision="0"></el-input-number>天后，买家可提货
+          <el-radio v-model="ruleForm.dynamicType" style="margin-right:10px" :label="2">下单</el-radio>
+          <el-input-number class="w100 mr10" v-model="ruleForm.dynamicD" :max="1000" :controls="false" :precision="0"></el-input-number>天后，买家可提货
         </div>
       </el-form-item>
       <el-form-item label="提货有效期" v-if="ruleForm.dateType == 1" prop="dynamicStop">
-        备货完成<el-input-number class="w100 mr5 ml5" v-model="ruleForm.dynamicStop" :min="2" :controls="false" :precision="0"></el-input-number>天后，停止自提
+        备货完成<el-input-number class="w100 mr10 ml10" v-model="ruleForm.dynamicStop" :min="2" :controls="false" :precision="0"></el-input-number>天后，停止自提
       </el-form-item>
       <el-form-item label="日期范围" v-if="ruleForm.dateType == 2" prop="fixedTime">
         <div class="mb10" v-for="(v, i) in ruleForm.fixedTime" :key="i" >
@@ -31,7 +31,7 @@
         </div>
         <el-button type="text" @click="addTime" :disabled="ruleForm.fixedTime.length >= 5"> <i class="el-icon-plus"></i>添加时间</el-button>
       </el-form-item>
-      <el-form-item label="超期发货单处理" required>
+      <el-form-item label="超期发货单处理">
         <div>
           <el-radio v-model="ruleForm.timeoutDealType" :label="1">到期自动完成核销</el-radio>
         </div>

src/views/gift-manage/module/update-real-cost.vue

 <template>
-  <el-dialog title="调整成本" :visible.sync="dialogVisible" width="600px" @close="cancelSubmit()">
+  <el-dialog title="调整成本" :visible.sync="dialogVisible" :width="[goodsSkuList.length > 1 ? '600px' : '500px']" @close="cancelSubmit()">
     <div v-loading="loading">
       <div v-if="goodsSkuList.length > 1">
         <el-table :data="goodsSkuList" :span-method="objectSpanMethod" border>
@@ -12,7 +12,7 @@
               <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" @click="$refs.popover.showPopper = false">取消</el-button>
+                  <el-button type="dafault" class="cancel-style" 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" popper-class="batch-style" visible-arrow placement="top" content="批量编辑">
@@ -351,4 +351,16 @@ export default {
   border-radius: 4px;
   padding: 5px !important;
 }
+.popver-button .el-button{
+  min-width: auto !important;
+  vertical-align: top;
+  line-height: 22px;
+  padding: 0 5px;
+  font-size: 12px;
+}
+.popver-button .el-button.cancel-style:focus, .el-button.cancel-style:hover {
+  color: #2f54eb !important;
+  border-color: #2f54eb !important;
+  background-color: #fff !important;
+}
 </style>
\ No newline at end of file

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

 <template>
-  <el-dialog title="调整库存" :visible.sync="dialogVisible" width="750px" @close="cancelSubmit()">
+  <el-dialog title="调整库存" :visible.sync="dialogVisible" :width="[goodsSkuList.length > 1 ? '750px' : '500px']" @close="cancelSubmit()">
     <div v-loading="loading">
       <!-- <div v-if="goodsSkuList.length > 1"  :class="[ heightLoading ? 'startHeight1' : '' ]"> -->
       <div v-if="goodsSkuList.length > 1">
@@ -24,7 +24,7 @@
                   <dm-input-number v-model="banthStock" width="140" style="margin-left:-2px;" controls-position="right" precision="0" :min="0" :max="999999"></dm-input-number>
                 </div>
                 <div class="popver-button" style="margin-top:18px;text-align:right">
-                  <el-button type="dafault" size="small" @click="$refs.popover.showPopper = false">取消</el-button>
+                  <el-button type="dafault" class="cancel-style" 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" popper-class="batch-style" visible-arrow placement="top" content="批量编辑">
@@ -395,4 +395,16 @@ export default {
   border-radius: 4px;
   padding: 5px !important;
 }
+.popver-button .el-button{
+  min-width: auto !important;
+  vertical-align: top;
+  line-height: 22px;
+  padding: 0 5px;
+  font-size: 12px;
+}
+.popver-button .el-button.cancel-style:focus, .el-button.cancel-style:hover {
+  color: #2f54eb !important;
+  border-color: #2f54eb !important;
+  background-color: #fff !important;
+}
 </style>
\ No newline at end of file

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

 <template>
-  <el-dialog title="调整成本" :visible.sync="dialogVisible" width="600px" @close="cancelSubmit()">
+  <el-dialog title="调整成本" :visible.sync="dialogVisible" width="500px" @close="cancelSubmit()">
     <div v-loading="loading">
       <el-form class="mt20">
         <el-form-item label="成本费用" required>

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

@@ -3,32 +3,32 @@
     <el-form :model="ruleForm" ref="ruleForm" :rules="rules" label-width="160px">
       <h3 class="pb20 title mb30">自提点信息</h3>
       <el-form-item label="自提点类型">
-        <el-radio v-model="ruleForm.type" :label="1">从门店中选择</el-radio>
+        <el-checkbox v-model="type" class="special" disabled>从门店中选择</el-checkbox>
       </el-form-item>
       <el-form-item v-if="isAdd" prop="storeWidgetId" label="门店选择器">
         <dm-store-select :selector-id="ruleForm.storeWidgetId" @save="saveStore"></dm-store-select>
       </el-form-item>
       <template v-else>
         <el-form-item label="自提点名称" required>
-          <el-input v-model="info.name" class="w600" type="text" disabled> </el-input>
+          <el-input v-model="info.name" class="w-360" type="text" disabled> </el-input>
         </el-form-item>
         <el-form-item label="联系电话" required>
-          <el-input v-model="info.phone" class="w600" type="text" disabled> </el-input>
+          <el-input v-model="info.phone" class="w-360" type="text" disabled> </el-input>
         </el-form-item>
         <el-form-item label="自提点地址" required>
-          <el-input v-model="info.address" class="w600" type="text" disabled> </el-input>
+          <el-input v-model="info.address" class="w-360" type="text" disabled> </el-input>
         </el-form-item>
         <el-form-item label="自提点图片" required>
           <img style="width: 150px; height: 150px" :src="info.imageUrl" draggable="false" />
         </el-form-item>
         <el-form-item label="营业时间">
           <div v-for="(item, index) in info.businessHour" :key="index" class="time-list">
-            <el-select v-model="item.weekdayShow" multiple placeholder="请选择" disabled class="mr10">
+            <el-select v-model="item.weekdayShow" multiple placeholder="请选择" disabled class="mr10 w-106">
               <el-option :label="item" :value="item" :key="item" v-for="item in ['周一', '周二', '周三','周四','周五','周六','周日']"></el-option>
             </el-select>
-            <el-time-select placeholder="起始时间" v-model="item.openTime" disabled style="width:170px" class="mr10"></el-time-select>
+            <el-time-select placeholder="起始时间" v-model="item.openTime" disabled class="mr10 w-106 padding-change"></el-time-select>
             <span style="font-size:14px;margin-right:10px;">至</span>
-            <el-time-select placeholder="起始时间" v-model="item.closeTime" disabled style="width:170px"></el-time-select>
+            <el-time-select placeholder="起始时间" v-model="item.closeTime" disabled class="w-106 padding-change"></el-time-select>
           </div>
         </el-form-item>
 
@@ -117,6 +117,7 @@ export default {
       },
       isAdd: this.$route.meta.type === 'add',
       isEdit: this.$route.meta.type === 'edit',
+      type: true,
     };
   },
   mounted() {
@@ -238,6 +239,9 @@ export default {
 .w600 {
   width: 600px;
 }
+.w-360{
+  width: 360px;
+}
 .title{
   height: 40px;
   line-height: 40px;
@@ -255,4 +259,15 @@ export default {
   margin-right: 8px;
   background: #2F54EB;
 }
+.w-106{
+  width: 106px;
+}
+</style>
+<style>
+.padding-change .el-input__inner{
+  padding-right: 10px !important;
+}
+.special .el-checkbox__input.is-checked+.el-checkbox__label{
+  color: #c4c6cf;
+}
 </style>
\ No newline at end of file

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

@@ -3,8 +3,8 @@
     <div class="pb20 clearfix flex-center">
       <el-input prefix-icon="el-icon-search" v-model="listParams.name" @change="refresh" class="w260 mrAuto" clearable placeholder="请输入自提点名称进行搜索"></el-input>
       <el-select class="more-select w160 mr10" @change="mutiOption" placeholder="批量操作">
-        <el-option :disabled="!selectList.length" :value="0">批量设置</el-option>
-        <el-option :disabled="!selectList.length" :value="1">批量删除</el-option>
+        <el-option :value="0">批量设置</el-option>
+        <el-option :value="1">批量删除</el-option>
       </el-select>
       <el-button type="default" @click="exportExcel"><i class="iconfont-welfare4 icon-xiazai"></i>&nbsp;导出</el-button>
       <el-button type="primary" @click="$router.push('/setting/pickup-add')">新建自提点</el-button>
@@ -89,6 +89,9 @@ export default {
       this.getTableList();
     },
     mutiOption(val) {
+      if(this.selectList.length == 0){
+        return this.$message.warning('请选择自提点');
+      }
       if(val == 0) {
         // 批量设置
         this.dialogVisible = true;

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

@@ -11,9 +11,9 @@
           <el-form-item label="礼品主图" required>
             <div class="member-upload-image">
               <div class="member-upload-image">
-                <dm-upload-picture :action-url="actionUrl" :image-list="image" :max-image-length="maxlength" accept="image/jpeg, image/jpg, image/png, image/gif" :before-upload="beforeUpload" @uploadOnSuccess="uploadOnSuccess" @deleteImage="deleteImage"></dm-upload-picture>
+                <dm-upload-picture :action-url="actionUrl" :image-list="image" :max-image-length="maxlength" accept="image/jpeg, image/jpg, image/png, image/gif" :before-upload="beforeUpload" @uploadOnSuccess="uploadOnSuccess" @sortImg="sortImg" @deleteImage="deleteImage"></dm-upload-picture>
               </div>
-              <span class="tip-warm" style="display:block">图片建议尺寸800*800px，格式jpg/png/gif，大小1MB以内，你可以拖拽图片调整顺序，最多上传 5 张</span>
+              <span class="tip-warm" style="display:block">图片建议尺寸&nbsp;800*800px，格式&nbsp;jpg/png/gif，大小&nbsp;1M&nbsp;以内，你可以拖拽图片调整顺序，最多上传 5 张</span>
             </div>
           </el-form-item>
           <el-form-item label="礼品详情">
@@ -423,8 +423,8 @@ export default {
       maxlength: 5, // 图片数量 默认 5
       image: [],
       // 规格值图片上传
-      uploadAction: window.location.origin + '/api-marketing/upload/upload-image',
-      // uploadAction: 'https://four.gicdev.com/api-marketing/upload/upload-image',
+      // uploadAction: window.location.origin + '/api-marketing/upload/upload-image',
+      uploadAction: 'https://four.gicdev.com/api-marketing/upload/upload-image',
       // uploadAction: '/welfare/upload/upload-image',
       openStorePick: 0,
       btnLoading: false,
@@ -702,6 +702,14 @@ export default {
       });
       this.goodsForm.giftImages = handelImage.join('');
     },
+    sortImg(val) {
+      this.image = val;
+      let handelImage = [];
+      this.image.forEach((item, index) =>{
+        handelImage[index] = item.url;
+      });
+      this.goodsForm.giftImages = handelImage.join('');
+    },
     handleChange(val) {
       this.goodsForm.giftDescrption = val;
     },
@@ -1716,12 +1724,13 @@ export default {
   height: 90px;
   background: #FFFFFF;
   border-radius: 4px;
-  border: 1px solid #FF5152;
+  border: 1px solid #dcdfe6;
   .avatar-uploader{
     z-index: 2;
     text-align: center;
     .avatar-uploader-icon{
       margin-top: 30px;
+      color: #909399;
     }
   }
   .triangle{
@@ -1732,7 +1741,7 @@ export default {
     height: 0;
     border-width: 0 6.5px 6px;
     border-style: solid;
-    border-color: transparent transparent #FF5152;
+    border-color: transparent transparent #dcdfe6;
   }
   .triangle:after{
     content: "";

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

@@ -22,7 +22,7 @@
             </div>
             <div class="fr">
               <!-- <el-select v-model="batchOperate" placeholder="批量操作" class="w-160 mr10 more-select" :disabled="selectList.length < 1" @change="handleBatch"> -->
-              <el-select placeholder="批量操作" class="w-160 mr10 more-select" :disabled="selectList.length < 1" @change="handleBatch">
+              <el-select placeholder="批量操作" class="w-160 mr10 more-select" @change="handleBatch">
                 <el-option label="批量隐藏" :value="0"></el-option>
                 <el-option label="批量取消隐藏" :value="1"></el-option>
                 <el-option label="批量禁用" :value="2"></el-option>
@@ -61,32 +61,34 @@
                 <div class="img-text">
                   <dm-preview-img :img="scope.row.giftImgUrl" style="display:inline-block;border: 1px solid #dcdfe6;padding:4px;border-radius:2px;" width="50" height="50"></dm-preview-img>
                   <div class="text">
-                    <p class="goods-descript">
-                      <el-popover open-delay="200" trigger="hover" class="item" placement="top">
-                        <div>{{ scope.row.giftName }}</div>
-                        <span class="inline-block hidden-data" slot="reference">{{ scope.row.giftName || '--' }}</span>
-                      </el-popover>
-                      <el-popover placement="top" trigger="click" :value="scope.row.visible" @show="getName(scope.row)">
-                        <div>
-                          <dm-input style="width:260px" type="text" v-model="changeName" :byte-type="1" :maxlength="30"> </dm-input>
-                        </div>
-                        <div class="popver-button" style="margin-top:18px;text-align:right">
-                          <el-button class="cancle-button" type="dafault" style="line-height:22px;padding:0 5px;min-width: auto!important" size="small" @click="onCancel(scope.row)">取消</el-button>
-                          <el-button type="primary" style="line-height:22px;padding:0 5px;min-width: auto!important" size="small" class="ml10 ml10" @click="handleName(scope.row)">确认</el-button>
-                        </div>
-                        <i class="el-icon-edit-outline inline-block ml5" slot="reference"></i>
-                      </el-popover>
-                    </p>
-                    <p class="goods-code">
-                      <el-popover trigger="hover" open-delay="200" placement="top">
-                        <div>
-                          <p>福利id：{{ scope.row.giftId }}</p>
-                          <div>更新时间：<p class="inline-block" v-html="formatDateTimeByType(scope.row.updateTime)"></p></div>
-                        </div>
-                        <i class="el-icon-question inline-block mr4" slot="reference"></i>
-                      </el-popover>
-                      礼品编码：{{ scope.row.giftNo || '--' }}
-                    </p>
+                    <div style="display:flex;flex-direction:column;justify-content:center;margin-top:8px">
+                      <p class="goods-descript">
+                        <el-popover open-delay="200" trigger="hover" class="item" placement="top">
+                          <div>{{ scope.row.giftName }}</div>
+                          <span class="inline-block hidden-data" slot="reference">{{ scope.row.giftName || '--' }}</span>
+                        </el-popover>
+                        <el-popover placement="top" trigger="click" :value="scope.row.visible" @show="getName(scope.row)">
+                          <div>
+                            <dm-input style="width:260px" type="text" v-model="changeName" :byte-type="1" :maxlength="30"> </dm-input>
+                          </div>
+                          <div class="popver-button" style="margin-top:18px;text-align:right">
+                            <el-button class="cancle-button" type="dafault" style="line-height:22px;padding:0 5px;min-width: auto!important" size="small" @click="onCancel(scope.row)">取消</el-button>
+                            <el-button type="primary" style="line-height:22px;padding:0 5px;min-width: auto!important" size="small" class="ml10 ml10" @click="handleName(scope.row)">确认</el-button>
+                          </div>
+                          <i class="el-icon-edit-outline inline-block ml5" slot="reference"></i>
+                        </el-popover>
+                      </p>
+                      <p class="goods-code">
+                        <el-popover trigger="hover" open-delay="200" placement="top">
+                          <div>
+                            <p>福利id：{{ scope.row.giftId }}</p>
+                            <div>更新时间：<p class="inline-block" v-html="formatDateTimeByType(scope.row.updateTime)"></p></div>
+                          </div>
+                          <i class="el-icon-question inline-block mr4" slot="reference"></i>
+                        </el-popover>
+                        礼品编码：{{ scope.row.giftNo || '--' }}
+                      </p>
+                    </div>
                   </div>
                 </div>
               </template>
@@ -382,6 +384,9 @@ export default {
     // 批量操作
     handleBatch(value) {
       console.log(value);
+      if(this.selectList.length == 0) {
+        return this.$message.warning('请选择礼品');
+      }
       let goodsIdArr = [];
       for (let item of this.selectList) {
         goodsIdArr.push(item.giftId);
@@ -404,7 +409,7 @@ export default {
             console.log('批量禁用');
           });
       }else if(value == 0){
-        this.$confirm('<div>是否批量隐藏?</div>', '批量隐藏', {
+        this.$confirm('<div>确认批量隐藏?</div>', '', {
           closeOnClickModal: false,
           showClose: false,
           type: 'warning',
@@ -417,7 +422,7 @@ export default {
             console.log('批量隐藏');
           });
       }else if(value == 1){
-        this.$confirm('<div>是否批量取消隐藏?</div>', '批量取消隐藏', {
+        this.$confirm('<div>确认批量取消隐藏?</div>', '', {
           closeOnClickModal: false,
           showClose: false,
           type: 'warning',
@@ -430,7 +435,7 @@ export default {
             console.log('批量取消隐藏');
           });
       }else if(value == 3){
-        this.$confirm('<div>是否批量启用?</div>', '批量启用', {
+        this.$confirm('<div>确认批量启用?</div>', '', {
           closeOnClickModal: false,
           showClose: false,
           type: 'warning',
@@ -650,8 +655,8 @@ export default {
       position: relative;
       .goods-descript {
         display: flex;
-        color: #606266;
-        line-height: 18px;
+        color: #303133;
+        line-height: 22px;
         font-size: 14px;
         // margin-bottom: 25px;
       }
@@ -660,8 +665,8 @@ export default {
         font-size: 12px;
         line-height: 16px;
         margin-bottom: 2px;
-        position: absolute;
-        bottom: 2px;
+        // position: absolute;
+        // bottom: 2px;
       }
     }
     .el-icon-edit-outline {

src/views/gift-manage/sales-return-setting.vue

@@ -3,7 +3,7 @@
     <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="150px" style="min-height:400px;">
       <el-form-item label="收货自动加库存" prop="backStockFlag">
         <el-switch :active-value="1" :inactive-value="0" v-model="ruleForm.backStockFlag"></el-switch>
-        <div class="gray03 fz12">开启自动加库存后，在退货单同意收货后，福利中心可占库存将会增加</div>
+        <div class="gray03 fz12">开启表示在退货单同意收货后，福利中心可占库存将会增加</div>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="submitForm">保存</el-button>

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

@@ -11,9 +11,9 @@
           <el-form-item label="礼品主图" required>
             <div class="member-upload-image">
               <div class="member-upload-image">
-                <dm-upload-picture :action-url="actionUrl" :image-list="image" :max-image-length="maxlength" accept="image/jpeg, image/jpg, image/png, image/gif" :before-upload="beforeUpload" @uploadOnSuccess="uploadOnSuccess" @deleteImage="deleteImage"></dm-upload-picture>
+                <dm-upload-picture :action-url="actionUrl" :image-list="image" :max-image-length="maxlength" accept="image/jpeg, image/jpg, image/png, image/gif" :before-upload="beforeUpload" @uploadOnSuccess="uploadOnSuccess" @sortImg="sortImg" @deleteImage="deleteImage"></dm-upload-picture>
               </div>
-              <span class="tip-warm" style="display:block">图片建议尺寸800*800px，格式jpg/png/gif，大小1MB以内，你可以拖拽图片调整顺序，最多上传 5 张</span>
+              <span class="tip-warm" style="display:block">图片建议尺寸&nbsp;800*800px，格式&nbsp;jpg/png/gif，大小&nbsp;1M&nbsp;以内，你可以拖拽图片调整顺序，最多上传 5 张</span>
             </div>
           </el-form-item>
           <el-form-item label="礼品详情" prop="giftDescrption">
@@ -53,9 +53,9 @@
               <div style="display:flex;">
                 <dm-editor width="900" height="280" :value="goodsForm.template" :placeholder="template" @change="handleChange2" :readonly="$route.query.giftId != ''"></dm-editor>
                 <!-- <dm-editor width="500" height="300" :value="goodsForm.template" is-sync :placeholder="template" @change="handleChange2" :readonly="$route.query.giftId != ''"></dm-editor> -->
-                <div style="margin-left:33px;background:#F7F8FA;width:400px;height:280px">
-                  <p style="font-size:12px;line-height:17px;color:#303133">用户申请履约后，发货内容将自动发送。</p>
-                  <div style="height: 250px;" class="step-style">
+                <div class="template-intro">
+                  <p class="template-title">用户申请履约后，发货内容将自动发送。</p>
+                  <div style="margin-top:20px;margin-bottom:63px;height:200px;margin-left:16px" class="step-style">
                     <el-steps direction="vertical" :active="active">
                       <el-step>
                         <div slot="description" style="width:360px">
@@ -66,15 +66,15 @@
                       <el-step>
                         <div slot="description">
                           <span class="step-text">下载模板并以“变量”为表头填入变量值。</span>
-                          <el-button type="text" @click="downloadFile">点击下载</el-button></div>
+                          <el-button type="text" @click="downloadFile" style="font-size:12px;line-height:17px">点击下载</el-button></div>
                       </el-step>
                       <el-step>
                         <div slot="description">
                           <div class="pickup-upload">
                             <span class="inline-block step-text" style="margin-bottom:20px">上传完善后的文件。</span>
                             <dm-upload-file
-                              width="300"
-                              class="inline-block"
+                              width="232"
+                              class="inline-block ml10"
                               :show-file-list="false"
                               :action="uploadAction"
                               :on-success="successUpload"
@@ -86,7 +86,7 @@
                               <span slot="tip" class="upload-tip inline-block">
                                 <!-- <el-button style="margin-right: 30px" type="text" @click="downloadFile">下载文件模板</el-button> -->
                                 <el-popover trigger="click" placement="right" popper-class="upload-popper">
-                                  <el-button slot="reference" type="text">查看导入规则</el-button>
+                                  <el-button slot="reference" type="text" style="font-size:12px;line-height:17px">查看导入规则</el-button>
                                   <div class="upload-tip-text">
                                     <p style="margin-bottom:10px">1.请按照顺序维护表头，所有变量均为必填项;</p>
                                     <p style="margin-bottom:10px">2.请勿导入重复的内容，导入的内容在原来基础上增加库存;</p>
@@ -94,10 +94,17 @@
                                     <p>4.正在异步上传处理中，我们将按照顺序分批次（5000/1批次）更新库存，请稍候刷新查看库存上传结果;</p>
                                   </div>
                                 </el-popover>
-                                <el-button type="text" v-if="isEdit" class="inline-block ml20" @click="checkUploadDetail">查看内容</el-button>
                               </span>
-                              <div slot="file-item" slot-scope="{fileData}">{{ fileData.name }}</div>
+                              <!-- <div slot="file-item" slot-scope="{fileData}">{{ fileData.name }}</div> -->
+                              <!-- <div slot="file-item" slot-scope="{fileData}">{{ fileData.name }}</div> -->
                             </dm-upload-file>
+                            <div class="pickup-list">
+                              <p class="pickup-list-name" v-if="uploadFile.name">
+                                <i class="iconfont-welfare4 icon-wenjian1 file-icon"></i>
+                                {{ uploadFile.name }}
+                              </p>
+                              <el-button type="text" v-if="isEdit" class="inline-block" style="font-size:12px;line-height:17px" @click="checkUploadDetail">查看内容</el-button>
+                            </div>
                           </div>
                         </div>
                       </el-step>
@@ -590,6 +597,14 @@ export default {
       });
       this.goodsForm.giftImages = handelImage.join('');
     },
+    sortImg(val) {
+      this.image = val;
+      let handelImage = [];
+      this.image.forEach((item, index) =>{
+        handelImage[index] = item.url;
+      });
+      this.goodsForm.giftImages = handelImage.join('');
+    },
     handleChange(val) {
       this.goodsForm.giftDescrption = val;
     },
@@ -676,8 +691,10 @@ export default {
 <style lang="scss" scoped>
 @import '@/assets/styles/colors.scss';
 .step-text{
-  color: #000000;
-  font-size: 14px;
+  color: #303133;
+  font-size: 12px;
+  line-height: 24px;
+  font-weight: 400;
 }
 .dash-style{
   border-bottom: 1px dashed #2f54eb;
@@ -813,7 +830,7 @@ export default {
 .pickup-upload{
   display: inline-block;
   vertical-align: top;
-  margin-left: 10px;
+  // margin-left: 10px;
   .upload-trigger{
     border-style: dashed;
     .upload-icon {
@@ -821,7 +838,8 @@ export default {
     }
   }
   .pickup-list {
-    margin-top: 18px;
+    margin-top: -10px;
+    margin-left: 117px;
     .pickup-list-name {
       font-size: 14px;
       font-weight: 400;
@@ -837,6 +855,20 @@ export default {
   font-size: 12px;
   color: #303133;
 }
+.template-intro{
+  margin-left: 33px;
+  background:#F7F8FA;
+  width: 400px;
+  height: 280px
+}
+.template-title{
+  font-size: 12px;
+  line-height: 17px;
+  color:#303133;
+  margin-left: 16px;
+  margin-top: 16px;
+  font-weight: 400;
+}
 /* 规格值 */
 </style>
 <style>

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

@@ -22,7 +22,7 @@
             </div>
             <div class="fr">
               <!-- <el-select v-model="batchOperate" placeholder="批量操作" class="w-160 mr10 more-select" :disabled="selectList.length < 1" @change="handleBatch"> -->
-              <el-select placeholder="批量操作" class="w-160 mr10 more-select" :disabled="selectList.length < 1" @change="handleBatch">
+              <el-select placeholder="批量操作" class="w-160 mr10 more-select" @change="handleBatch">
                 <el-option label="批量隐藏" :value="0"></el-option>
                 <el-option label="批量取消隐藏" :value="1"></el-option>
                 <el-option label="批量禁用" :value="2"></el-option>
@@ -61,32 +61,34 @@
                 <div class="img-text">
                   <dm-preview-img :img="scope.row.giftImgUrl" style="display:inline-block;border: 1px solid #dcdfe6;padding:4px;border-radius:2px;" width="50" height="50"></dm-preview-img>
                   <div class="text">
-                    <p class="goods-descript">
-                      <el-popover open-delay="200" class="item" trigger="hover" placement="top">
-                        <div>{{ scope.row.giftName }}</div>
-                        <span class="inline-block hidden-data" slot="reference">{{ scope.row.giftName || '--' }}</span>
-                      </el-popover>
-                      <el-popover placement="top" trigger="click" :value="scope.row.visible" @show="getName(scope.row)">
-                        <div>
-                          <dm-input style="width:260px" type="text" v-model="changeName" :byte-type="1" :maxlength="30"> </dm-input>
-                        </div>
-                        <div class="popver-button" style="margin-top:18px;text-align:right">
-                          <el-button class="cancle-button" type="dafault" style="line-height:22px;padding:0 5px;min-width: auto!important" size="small" @click="onCancel(scope.row)">取消</el-button>
-                          <el-button type="primary" size="small" style="line-height:22px;padding:0 5px;min-width: auto!important" class="ml10 ml10" @click="handleName(scope.row)">确认</el-button>
-                        </div>
-                        <i class="el-icon-edit-outline inline-block ml5" style="margin-top:-5px" slot="reference"></i>
-                      </el-popover>
-                    </p>
-                    <p class="goods-code">
-                      <el-popover open-delay="200" trigger="hover" placement="top">
-                        <div>
-                          <p class="goods-code">福利id：{{ scope.row.giftId }}</p>
-                          <div>更新时间：<p class="inline-block" v-html="formatDateTimeByType(scope.row.updateTime)"></p></div>
-                        </div>
-                        <i class="el-icon-question mr4" slot="reference"></i>
-                      </el-popover>
-                      礼品编码：{{ scope.row.giftNo || '--' }}
-                    </p>
+                    <div style="display:flex;flex-direction:column;justify-content:center;margin-top:8px">
+                      <p class="goods-descript">
+                        <el-popover open-delay="200" class="item" trigger="hover" placement="top">
+                          <div>{{ scope.row.giftName }}</div>
+                          <span class="inline-block hidden-data" slot="reference">{{ scope.row.giftName || '--' }}</span>
+                        </el-popover>
+                        <el-popover placement="top" trigger="click" :value="scope.row.visible" @show="getName(scope.row)">
+                          <div>
+                            <dm-input style="width:260px" type="text" v-model="changeName" :byte-type="1" :maxlength="30"> </dm-input>
+                          </div>
+                          <div class="popver-button" style="margin-top:18px;text-align:right">
+                            <el-button class="cancle-button" type="dafault" style="line-height:22px;padding:0 5px;min-width: auto!important" size="small" @click="onCancel(scope.row)">取消</el-button>
+                            <el-button type="primary" size="small" style="line-height:22px;padding:0 5px;min-width: auto!important" class="ml10 ml10" @click="handleName(scope.row)">确认</el-button>
+                          </div>
+                          <i class="el-icon-edit-outline inline-block ml5" style="margin-top:-5px" slot="reference"></i>
+                        </el-popover>
+                      </p>
+                      <p class="goods-code">
+                        <el-popover open-delay="200" trigger="hover" placement="top">
+                          <div>
+                            <p class="goods-code">福利id：{{ scope.row.giftId }}</p>
+                            <div>更新时间：<p class="inline-block" v-html="formatDateTimeByType(scope.row.updateTime)"></p></div>
+                          </div>
+                          <i class="el-icon-question mr4" slot="reference"></i>
+                        </el-popover>
+                        礼品编码：{{ scope.row.giftNo || '--' }}
+                      </p>
+                    </div>
                   </div>
                 </div>
               </template>
@@ -455,6 +457,9 @@ export default {
     // 批量操作
     handleBatch(value) {
       console.log(value);
+      if(this.selectList.length == 0) {
+        return this.$message.warning('请选择礼品');
+      }
       let goodsIdArr = [];
       for (let item of this.selectList) {
         goodsIdArr.push(item.giftId);
@@ -477,7 +482,7 @@ export default {
             console.log('批量禁用');
           });
       }else if(value == 0){
-        this.$confirm('<div>是否批量隐藏?</div>', '批量隐藏', {
+        this.$confirm('<div>确认批量隐藏?</div>', '', {
           closeOnClickModal: false,
           showClose: false,
           type: 'warning',
@@ -490,7 +495,7 @@ export default {
             console.log('批量隐藏');
           });
       }else if(value == 1){
-        this.$confirm('<div>是否批量取消隐藏?</div>', '批量取消隐藏', {
+        this.$confirm('<div>确认批量取消隐藏?</div>', '', {
           closeOnClickModal: false,
           showClose: false,
           type: 'warning',
@@ -503,7 +508,7 @@ export default {
             console.log('批量取消隐藏');
           });
       }else if(value == 3){
-        this.$confirm('<div>是否批量启用?</div>', '批量启用', {
+        this.$confirm('<div>确认批量启用?</div>', '', {
           closeOnClickModal: false,
           showClose: false,
           type: 'warning',
@@ -723,8 +728,8 @@ export default {
       position: relative;
       .goods-descript {
         display: flex;
-        color: #606266;
-        line-height: 18px;
+        color: #303133;
+        line-height: 22px;
         font-size: 14px;
         // margin-bottom: 25px;
       }
@@ -733,8 +738,8 @@ export default {
         font-size: 12px;
         line-height: 16px;
         margin-bottom: 2px;
-        position: absolute;
-        bottom: 2px;
+        // position: absolute;
+        // bottom: 2px;
       }
     }
     .el-icon-edit-outline {