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

# Conflicts:
#	dist/index.html
#	dist/js/app.45dad17e.js
#	dist/js/app.7c970390.js
#	dist/js/app.c5158997.js

dist/css/chunk-5866ea6d.c4414c54.css

+.step-text[data-v-09b3cc23]{color:#000;font-size:14px}.dash-style[data-v-09b3cc23]{border-bottom:1px dashed #2f54eb}.upload-btn[data-v-09b3cc23]{height:40px;border:1px dashed #c0c4cc;display:inline-block;font-size:14px;color:#c0c4cc;cursor:pointer;margin-right:10px;width:250px;border-radius:4px}.upload-btn .el-icon-upload2[data-v-09b3cc23]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-09b3cc23]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-09b3cc23]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-09b3cc23]{padding:0}.w-630[data-v-09b3cc23]{width:630px}.mb56[data-v-09b3cc23]{margin-bottom:56px}.from-content[data-v-09b3cc23]{position:relative}.from-content .demo-ruleForm .form-section[data-v-09b3cc23]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-09b3cc23]{color:#303133;font-size:14px;font-weight:700;margin-bottom:31px;margin-left:20px;padding-bottom:9px;border-bottom:1px solid #dfdfdf}.from-content .demo-ruleForm .form-section h3[data-v-09b3cc23]:before{clear:both;content:"";display:inline-block;overflow:hidden;width:3px;height:12px;line-height:14px;margin-right:8px;background:#2f54eb}.from-content .demo-ruleForm .form-section .tip-warm[data-v-09b3cc23]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-09b3cc23]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .fixed-btn[data-v-09b3cc23]{width:100%;height:56px;position:fixed;bottom:0;left:200px;background:#fff;border-top:1px solid #e4e7ed;text-align:center;margin-left:-100px;z-index:2;font-size:0}.from-content .demo-ruleForm .fixed-btn .el-button[data-v-09b3cc23]{margin-top:12px}.from-content .anchor-link[data-v-09b3cc23]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-09b3cc23]{height:24px;line-height:24px;color:#606266;font-size:12px;border-left:2px solid #ebeef5;padding-left:18px;cursor:pointer}.from-content .see-btn[data-v-09b3cc23]{color:#909399;margin-left:15px}.from-content .see-btn[data-v-09b3cc23]:hover{color:#2f54ed}.ml20[data-v-09b3cc23]{margin-left:20px}.mr10[data-v-09b3cc23]{margin-right:10px}.tips-content[data-v-09b3cc23]{position:absolute;left:-4px;top:6px}.store-tips[data-v-09b3cc23]{width:200px;position:absolute;left:-10px}.underline[data-v-09b3cc23]{text-decoration:underline}.pickup-upload[data-v-09b3cc23]{display:inline-block;vertical-align:top;margin-left:10px}.pickup-upload .upload-trigger[data-v-09b3cc23]{border-style:dashed}.pickup-upload .upload-trigger .upload-icon[data-v-09b3cc23]{font-size:14px}.pickup-upload .pickup-list[data-v-09b3cc23]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-09b3cc23]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-09b3cc23]{font-size:14px}.right-border{border-right:1px solid #ebeef5}.step-style .el-step.is-vertical .el-step__line{top:30px;left:8px;-webkit-transform:scaleX(.5);transform:scaleX(.5)}.step-style .el-step__head.is-finish{color:#2f54eb;border-color:#2f54eb}.step-style .el-step__icon.is-text{border:1px solid}.step-style .el-step__icon{width:16px;height:16px}.step-style .el-step__icon-inner{font-size:12px}
\ No newline at end of file

dist/css/chunk-c0503492.dc590962.css

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

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

@@ -295,7 +295,7 @@ export default {
     this.giftId = this.$route.query.giftId;
     if (this.giftId) {
       // this.readonly = true;
-      this.bread[2].breadName = '编辑礼品';
+      this.bread[3].breadName = '编辑礼品';
       this.getMess();
       this.isEdit = true;
     }else{