Skip to content

W
welfare
Commit 22c96393 by 黑潮
Options

update: 修复bug

parent 61dbc61b
Showing with 13 additions and 12 deletions
dist/css/card-package.ddca0467.css → dist/css/card-package.b431f843.css
.ml40[data-v-1c8276c7]{margin-left:40px}.filter-block[data-v-1c8276c7]{color:#303133;background:#f7f8fa;padding:20px;margin-bottom:20px}.filter-block span[data-v-1c8276c7]{margin-left:10px;margin-right:10px;line-height:20px}.card[data-v-1c8276c7]{padding-left:70px;min-height:60px;position:relative}.card img[data-v-1c8276c7]{position:absolute;left:0;top:0;width:60px;height:60px;border-radius:4px}.card .name[data-v-1c8276c7]{color:#303133;padding-top:8px;margin-bottom:7px;line-height:22px}.el-icon-delete[data-v-f64ae786]{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-f64ae786]:hover{background:#fef0f0;border:1px solid #fbc4c4;color:#f5222d}
\ No newline at end of file
.ml40[data-v-1c8276c7]{margin-left:40px}.filter-block[data-v-1c8276c7]{color:#303133;background:#f7f8fa;padding:20px;margin-bottom:20px}.filter-block span[data-v-1c8276c7]{margin-left:10px;margin-right:10px;line-height:20px}.card[data-v-1c8276c7]{padding-left:70px;min-height:60px;position:relative}.card img[data-v-1c8276c7]{position:absolute;left:0;top:0;width:60px;height:60px;border-radius:4px}.card .name[data-v-1c8276c7]{color:#303133;padding-top:8px;margin-bottom:7px;line-height:22px}.el-icon-delete[data-v-de3ef944]{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-de3ef944]:hover{background:#fef0f0;border:1px solid #fbc4c4;color:#f5222d}
\ No newline at end of file
dist/css/chunk-2ecce8fb.e523f06b.css deleted 100644 → 0
.right-border{border-right:1px solid #ebeef5}.hidden-limit .dm-input__counter{display:none}.popver-button .el-button:not(.el-button--text){min-width:50px}.file-style:hover .upload-trigger[data-v-a3970ba0]{border-color:#1890ff}.upload-ele .el-button[data-v-a3970ba0]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-a3970ba0]{padding:0}.uploadText p[data-v-a3970ba0]{line-height:26px}.upload-tip-text[data-v-a3970ba0]{font-size:12px;color:#303133}.pickup-upload[data-v-a3970ba0]{display:inline-block;vertical-align:top}.pickup-upload .upload-trigger[data-v-a3970ba0]{border-style:dashed;margin-right:10px}.pickup-upload .upload-trigger .upload-icon[data-v-a3970ba0]{font-size:14px}.pickup-upload .pickup-list[data-v-a3970ba0]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-a3970ba0]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-a3970ba0]{font-size:14px}.w360[data-v-073e8f00]{width:360px}.w-160[data-v-073e8f00]{width:160px}.w140[data-v-073e8f00]{width:140px}.w350[data-v-073e8f00]{width:350px}.mr4[data-v-073e8f00]{margin-right:4px}.tab-top[data-v-073e8f00]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-073e8f00],.tab-top[data-v-073e8f00]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-073e8f00]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-073e8f00]{height:60px}.table-content .img-text img[data-v-073e8f00]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-073e8f00]{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-073e8f00]{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-073e8f00]{color:#909399;font-size:12px;line-height:16px;margin-bottom:2px}.table-content .img-text .el-icon-edit-outline[data-v-073e8f00]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-073e8f00]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-073e8f00]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-073e8f00]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-073e8f00]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-073e8f00]:hover{color:#2f54ed}.undeline-dash[data-v-073e8f00]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-073e8f00]{display:inline-block;line-height:32px}.hidden-data[data-v-073e8f00]{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-3195a346.af72490c.css 0 → 100644
.right-border{border-right:1px solid #ebeef5}.hidden-limit .dm-input__counter{display:none}.popver-button .el-button:not(.el-button--text){min-width:50px}.file-style:hover .upload-trigger[data-v-a3970ba0]{border-color:#1890ff}.upload-ele .el-button[data-v-a3970ba0]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-a3970ba0]{padding:0}.uploadText p[data-v-a3970ba0]{line-height:26px}.upload-tip-text[data-v-a3970ba0]{font-size:12px;color:#303133}.pickup-upload[data-v-a3970ba0]{display:inline-block;vertical-align:top}.pickup-upload .upload-trigger[data-v-a3970ba0]{border-style:dashed;margin-right:10px}.pickup-upload .upload-trigger .upload-icon[data-v-a3970ba0]{font-size:14px}.pickup-upload .pickup-list[data-v-a3970ba0]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-a3970ba0]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-a3970ba0]{font-size:14px}.w360[data-v-3ee3096b]{width:360px}.w-160[data-v-3ee3096b]{width:160px}.w140[data-v-3ee3096b]{width:140px}.w350[data-v-3ee3096b]{width:350px}.mr4[data-v-3ee3096b]{margin-right:4px}.tab-top[data-v-3ee3096b]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-3ee3096b],.tab-top[data-v-3ee3096b]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-3ee3096b]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-3ee3096b]{height:60px}.table-content .img-text img[data-v-3ee3096b]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-3ee3096b]{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-3ee3096b]{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-3ee3096b]{color:#909399;font-size:12px;line-height:16px;margin-bottom:2px}.table-content .img-text .el-icon-edit-outline[data-v-3ee3096b]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-3ee3096b]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-3ee3096b]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-3ee3096b]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-3ee3096b]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-3ee3096b]:hover{color:#2f54ed}.undeline-dash[data-v-3ee3096b]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-3ee3096b]{display:inline-block;line-height:32px}.hidden-data[data-v-3ee3096b]{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-7cfb1e2c.13d59191.css 0 → 100644
.step-text[data-v-669ed885]{color:#303133;font-size:12px;line-height:24px;font-weight:400}.dash-style[data-v-669ed885]{border-bottom:1px dashed #2f54eb}.upload-btn[data-v-669ed885]{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-669ed885]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-669ed885]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-669ed885]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-669ed885]{padding:0}.w-630[data-v-669ed885]{width:630px}.mb56[data-v-669ed885]{margin-bottom:56px}.from-content[data-v-669ed885]{position:relative}.from-content .demo-ruleForm .form-section[data-v-669ed885]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-669ed885]{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-669ed885]: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-669ed885]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-669ed885]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .fixed-btn[data-v-669ed885]{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-669ed885]{margin-top:12px}.from-content .anchor-link[data-v-669ed885]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-669ed885]{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-669ed885]{color:#909399;margin-left:15px}.from-content .see-btn[data-v-669ed885]:hover{color:#2f54ed}.ml20[data-v-669ed885]{margin-left:20px}.mr10[data-v-669ed885]{margin-right:10px}.tips-content[data-v-669ed885]{position:absolute;left:-4px;top:6px}.store-tips[data-v-669ed885]{width:200px;position:absolute;left:-10px}.underline[data-v-669ed885]{text-decoration:underline}.pickup-upload[data-v-669ed885]{display:inline-block;vertical-align:top}.pickup-upload .upload-trigger[data-v-669ed885]{border-style:dashed}.pickup-upload .upload-trigger .upload-icon[data-v-669ed885]{font-size:14px}.pickup-upload .pickup-list[data-v-669ed885]{margin-top:-10px;margin-left:117px}.pickup-upload .pickup-list .pickup-list-name[data-v-669ed885]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-669ed885]{font-size:14px}.upload-tip-text[data-v-669ed885]{font-size:12px;color:#303133}.template-intro[data-v-669ed885]{margin-left:33px;background:#f7f8fa;width:400px;height:280px}.template-title[data-v-669ed885]{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-eb88ab24.fd9bef7f.css deleted 100644 → 0
.step-text[data-v-ea280b5a]{color:#303133;font-size:12px;line-height:24px;font-weight:400}.dash-style[data-v-ea280b5a]{border-bottom:1px dashed #2f54eb}.upload-btn[data-v-ea280b5a]{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-ea280b5a]{font-size:18px;color:#c0c4cc}.upload-btn[data-v-ea280b5a]:hover{border-color:#1890ff}.upload-ele .el-button[data-v-ea280b5a]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-ea280b5a]{padding:0}.w-630[data-v-ea280b5a]{width:630px}.mb56[data-v-ea280b5a]{margin-bottom:56px}.from-content[data-v-ea280b5a]{position:relative}.from-content .demo-ruleForm .form-section[data-v-ea280b5a]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-ea280b5a]{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-ea280b5a]: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-ea280b5a]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-ea280b5a]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .fixed-btn[data-v-ea280b5a]{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-ea280b5a]{margin-top:12px}.from-content .anchor-link[data-v-ea280b5a]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-ea280b5a]{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-ea280b5a]{color:#909399;margin-left:15px}.from-content .see-btn[data-v-ea280b5a]:hover{color:#2f54ed}.ml20[data-v-ea280b5a]{margin-left:20px}.mr10[data-v-ea280b5a]{margin-right:10px}.tips-content[data-v-ea280b5a]{position:absolute;left:-4px;top:6px}.store-tips[data-v-ea280b5a]{width:200px;position:absolute;left:-10px}.underline[data-v-ea280b5a]{text-decoration:underline}.pickup-upload[data-v-ea280b5a]{display:inline-block;vertical-align:top}.pickup-upload .upload-trigger[data-v-ea280b5a]{border-style:dashed}.pickup-upload .upload-trigger .upload-icon[data-v-ea280b5a]{font-size:14px}.pickup-upload .pickup-list[data-v-ea280b5a]{margin-top:-10px;margin-left:117px}.pickup-upload .pickup-list .pickup-list-name[data-v-ea280b5a]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-ea280b5a]{font-size:14px}.upload-tip-text[data-v-ea280b5a]{font-size:12px;color:#303133}.template-intro[data-v-ea280b5a]{margin-left:33px;background:#f7f8fa;width:400px;height:280px}.template-title[data-v-ea280b5a]{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
src/views/card/card-package/form.vue
......@@ -76,7 +76,7 @@
</el-form-item>
<el-form-item>
<el-button type="primary" v-if="isAdd" @click="addForm">保存并添加卡券</el-button>
<el-button type="primary" :disabled="ruleForm.packageStock == info.packageStock" v-else @click="editForm">保存</el-button>
<el-button type="primary" v-else @click="editForm">保存</el-button>
</el-form-item>
</el-form>
<div class="hidden">
......
src/views/gift-manage/real-gift-detail.vue
......@@ -63,7 +63,7 @@
</p>
<p style="font-size:12px;color:#FF5152;position:absolute;bottom:-32px" v-if="!v.propImg">请添加规格图片</p>
</div>
<span class="el-icon-error" @click="deleteValue(item, v, index, n)"></span>
<span class="el-icon-error" v-if="item.valueList.length > 1" @click="deleteValue(item, v, index, n)"></span>
</div>
<el-button type="text" @click="addValue(item)">添加规格值</el-button>
<p v-if="!index && isStdImg" :class="[item.valueList.length ? 'hasValueList' : 'emptyValueList']">仅支持为第一组规格设置规格图片，买家选择不同规格会看到对应规格图片，建议尺寸 800*800px。</p>
......
src/views/gift-manage/virtual-gift-detail.vue
......@@ -532,7 +532,7 @@ export default {
this.image.forEach((item, index) =>{
handelImage[index] = item.url;
});
this.goodsForm.giftImages = handelImage.join('');
this.goodsForm.giftImages = handelImage.join(',');
},
// 删除图片 返回图片列表的索引 你可以根据这个索引去找对应图片的id
deleteImage(i) {
......@@ -541,7 +541,7 @@ export default {
this.image.forEach((item, index) =>{
handelImage[index] = item.url;
});
this.goodsForm.giftImages = handelImage.join('');
this.goodsForm.giftImages = handelImage.join(',');
},
sortImg(val) {
this.image = val;
......@@ -549,7 +549,7 @@ export default {
this.image.forEach((item, index) =>{
handelImage[index] = item.url;
});
this.goodsForm.giftImages = handelImage.join('');
this.goodsForm.giftImages = handelImage.join(',');
},
handleChange(val) {
this.goodsForm.giftDescrption = val;
......
src/views/gift-manage/virtual-gift.vue
......@@ -59,7 +59,7 @@
<el-table-column label="礼品信息" width="350px">
<template slot-scope="scope">
<div class="img-text">
<dm-preview-img :img="scope.row.giftImgUrl" style="display:inline-block;border: 1px solid #dcdfe6;border-radius:4px;" width="58" height="58"></dm-preview-img>
<dm-preview-img :img="scope.row.giftImgUrl[0]" style="display:inline-block;border: 1px solid #dcdfe6;border-radius:4px;" width="58" height="58"></dm-preview-img>
<div class="text">
<div style="display:flex;flex-direction:column;justify-content:center;margin-top:8px">
<p class="goods-descript">
......@@ -346,6 +346,7 @@ export default {
giftPage(params).then(res =>{
this.tableData = res.result.result;
this.tableData.forEach(item =>{
item.giftImgUrl = typeof item.giftImgUrl == 'string' ? item.giftImgUrl.split(',') : [];
this.$set(item, 'visible', false);
});
this.total = res.result.totalCount;
......
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