Skip to content

W
welfare
Commit e8d7d677 by 萱草
Options

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

# Conflicts:
#	dist/index.html
#	dist/js/app.1557e2fc.js
#	dist/js/app.6426cf36.js
#	dist/js/app.a792222f.js
parents 4fa9ff91 ac36c4d9
Showing with 6 additions and 5 deletions
dist/css/chunk-324f673a.ed149501.css deleted 100644 → 0
.step-text[data-v-573c70f2]{color:#000;font-size:14px}.dash-style[data-v-573c70f2]{border-bottom:1px dashed #2f54eb}.upload-btn[data-v-573c70f2]{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-573c70f2]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-573c70f2]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-573c70f2]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-573c70f2]{padding:0}.w-630[data-v-573c70f2]{width:630px}.mb56[data-v-573c70f2]{margin-bottom:56px}.from-content[data-v-573c70f2]{position:relative}.from-content .demo-ruleForm .form-section[data-v-573c70f2]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-573c70f2]{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-573c70f2]: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-573c70f2]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-573c70f2]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .fixed-btn[data-v-573c70f2]{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-573c70f2]{margin-top:12px}.from-content .anchor-link[data-v-573c70f2]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-573c70f2]{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-573c70f2]{color:#909399;margin-left:15px}.from-content .see-btn[data-v-573c70f2]:hover{color:#2f54ed}.ml20[data-v-573c70f2]{margin-left:20px}.mr10[data-v-573c70f2]{margin-right:10px}.tips-content[data-v-573c70f2]{position:absolute;left:-4px;top:6px}.store-tips[data-v-573c70f2]{width:200px;position:absolute;left:-10px}.underline[data-v-573c70f2]{text-decoration:underline}.pickup-upload[data-v-573c70f2]{display:inline-block;vertical-align:top;margin-left:10px}.pickup-upload .upload-trigger[data-v-573c70f2]{border-style:dashed}.pickup-upload .upload-trigger .upload-icon[data-v-573c70f2]{font-size:14px}.pickup-upload .pickup-list[data-v-573c70f2]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-573c70f2]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-573c70f2]{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-cd57974a.d31f8c35.css 0 → 100644
.step-text[data-v-738313e7]{color:#000;font-size:14px}.dash-style[data-v-738313e7]{border-bottom:1px dashed #2f54eb}.upload-btn[data-v-738313e7]{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-738313e7]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-738313e7]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-738313e7]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-738313e7]{padding:0}.w-630[data-v-738313e7]{width:630px}.mb56[data-v-738313e7]{margin-bottom:56px}.from-content[data-v-738313e7]{position:relative}.from-content .demo-ruleForm .form-section[data-v-738313e7]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-738313e7]{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-738313e7]: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-738313e7]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-738313e7]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .fixed-btn[data-v-738313e7]{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-738313e7]{margin-top:12px}.from-content .anchor-link[data-v-738313e7]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-738313e7]{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-738313e7]{color:#909399;margin-left:15px}.from-content .see-btn[data-v-738313e7]:hover{color:#2f54ed}.ml20[data-v-738313e7]{margin-left:20px}.mr10[data-v-738313e7]{margin-right:10px}.tips-content[data-v-738313e7]{position:absolute;left:-4px;top:6px}.store-tips[data-v-738313e7]{width:200px;position:absolute;left:-10px}.underline[data-v-738313e7]{text-decoration:underline}.pickup-upload[data-v-738313e7]{display:inline-block;vertical-align:top;margin-left:10px}.pickup-upload .upload-trigger[data-v-738313e7]{border-style:dashed}.pickup-upload .upload-trigger .upload-icon[data-v-738313e7]{font-size:14px}.pickup-upload .pickup-list[data-v-738313e7]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-738313e7]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-738313e7]{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
......@@ -51,7 +51,8 @@
<el-form-item label="发货内容" required prop="template">
<template>
<div style="display:flex;">
<dm-editor width="500" height="300" :value="goodsForm.template" is-sync :placeholder="template" @change="handleChange2" :readonly="$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>
<!-- <dm-editor width="500" height="300" :value="goodsForm.template" is-sync :placeholder="template" @change="handleChange2" :readonly="false"></dm-editor> -->
<div class="ml20">
<p>用户申请履约后，发货内容将自动发送。</p>
<div style="height: 250px;" class="step-style">
......@@ -269,7 +270,7 @@ export default {
dialogVisible: false,
// description: '',
fileName: '',
readonly: false,
// readonly: false,
isEdit: false,
active: 3,
image: [],
......@@ -290,7 +291,7 @@ export default {
this.getLoginUser();
this.giftId = this.$route.query.giftId;
if (this.giftId) {
this.readonly = true;
// this.readonly = true;
this.bread[2].breadName = '编辑礼品';
this.getMess();
this.isEdit = true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment