Skip to content

W
welfare
Commit 20dd3d47 by 萱草
Options

update: 礼品管理bug修复及UI调整

parent c545b214
Showing with 22 additions and 14 deletions
dist/css/chunk-3339acd5.0f29488e.css 0 → 100644
.hidden-limit .dm-input__counter{display:none}.popver-button .el-button:not(.el-button--text){min-width:50px}.right-border{border-right:1px solid #ebeef5}.w360[data-v-2eb9b096]{width:360px}.w-160[data-v-2eb9b096]{width:160px}.w140[data-v-2eb9b096]{width:140px}.w350[data-v-2eb9b096]{width:350px}.tab-top[data-v-2eb9b096]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-2eb9b096],.tab-top[data-v-2eb9b096]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-2eb9b096]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-2eb9b096]{height:60px}.table-content .img-text img[data-v-2eb9b096]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-2eb9b096]{display:inline-block;vertical-align:top;width:75%;height:60px;margin-left:3px;font-size:13px;line-height:14px;position:relative}.table-content .img-text .text .goods-descript[data-v-2eb9b096]{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-2eb9b096]{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-2eb9b096]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-2eb9b096]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-2eb9b096]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-2eb9b096]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-2eb9b096]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-2eb9b096]:hover{color:#2f54ed}.undeline-dash[data-v-2eb9b096]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-2eb9b096]{display:inline-block;line-height:32px}.hidden-data[data-v-2eb9b096]{max-width:180px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.stock-box .el-tooltip__popper{width:150px}
\ No newline at end of file
dist/css/chunk-3a7bafff.65b1a072.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-16033c0a]{border-color:#1890ff}.upload-ele .el-button[data-v-16033c0a]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-16033c0a]{padding:0}.uploadText p[data-v-16033c0a]{line-height:26px}.pickup-upload[data-v-16033c0a]{display:inline-block;vertical-align:top}.pickup-upload .upload-trigger[data-v-16033c0a]{border-style:dashed;margin-right:10px}.pickup-upload .upload-trigger .upload-icon[data-v-16033c0a]{font-size:14px}.pickup-upload .pickup-list[data-v-16033c0a]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-16033c0a]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-16033c0a]{font-size:14px}.w360[data-v-0d1697c0]{width:360px}.w-160[data-v-0d1697c0]{width:160px}.w140[data-v-0d1697c0]{width:140px}.w350[data-v-0d1697c0]{width:350px}.tab-top[data-v-0d1697c0]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-0d1697c0],.tab-top[data-v-0d1697c0]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-0d1697c0]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-0d1697c0]{height:60px}.table-content .img-text img[data-v-0d1697c0]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-0d1697c0]{display:inline-block;vertical-align:top;width:75%;height:60px;margin-left:3px;font-size:13px;line-height:14px;position:relative}.table-content .img-text .text .goods-descript[data-v-0d1697c0]{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-0d1697c0]{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-0d1697c0]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-0d1697c0]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-0d1697c0]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-0d1697c0]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-0d1697c0]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-0d1697c0]:hover{color:#2f54ed}.undeline-dash[data-v-0d1697c0]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-0d1697c0]{display:inline-block;line-height:32px}.hidden-data[data-v-0d1697c0]{max-width:180px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.stock-box .el-tooltip__popper{width:150px}
\ No newline at end of file
dist/css/chunk-52a8e076.3e6aeb63.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-16033c0a]{border-color:#1890ff}.upload-ele .el-button[data-v-16033c0a]{border:none;color:#c0c4cc}.upload-ele .el-button--small[data-v-16033c0a]{padding:0}.uploadText p[data-v-16033c0a]{line-height:26px}.pickup-upload[data-v-16033c0a]{display:inline-block;vertical-align:top}.pickup-upload .upload-trigger[data-v-16033c0a]{border-style:dashed;margin-right:10px}.pickup-upload .upload-trigger .upload-icon[data-v-16033c0a]{font-size:14px}.pickup-upload .pickup-list[data-v-16033c0a]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-16033c0a]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-16033c0a]{font-size:14px}.w360[data-v-498019f6]{width:360px}.w-160[data-v-498019f6]{width:160px}.w140[data-v-498019f6]{width:140px}.w350[data-v-498019f6]{width:350px}.tab-top[data-v-498019f6]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-498019f6],.tab-top[data-v-498019f6]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-498019f6]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-498019f6]{height:60px}.table-content .img-text img[data-v-498019f6]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-498019f6]{display:inline-block;vertical-align:top;width:75%;height:60px;margin-left:3px;font-size:13px;line-height:14px;position:relative}.table-content .img-text .text .goods-descript[data-v-498019f6]{color:#606266;line-height:18px;font-size:14px}.table-content .img-text .text .goods-code[data-v-498019f6]{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-498019f6]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-498019f6]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-498019f6]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-498019f6]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-498019f6]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-498019f6]:hover{color:#2f54ed}.undeline-dash[data-v-498019f6]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-498019f6]{display:inline-block;line-height:32px}.hidden-data[data-v-498019f6]{max-width:200px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.stock-box .el-tooltip__popper{width:150px}
\ No newline at end of file
dist/css/chunk-7b0ab43c.1de63bb8.css deleted 100644 → 0
.hidden-limit .dm-input__counter{display:none}.popver-button .el-button:not(.el-button--text){min-width:50px}.right-border{border-right:1px solid #ebeef5}.w360[data-v-4614bd0a]{width:360px}.w-160[data-v-4614bd0a]{width:160px}.w140[data-v-4614bd0a]{width:140px}.w350[data-v-4614bd0a]{width:350px}.tab-top[data-v-4614bd0a]{height:32px;margin:20px 20px 0 20px}.tab-top .fl[data-v-4614bd0a],.tab-top[data-v-4614bd0a]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.table-content[data-v-4614bd0a]{margin:20px;padding-bottom:20px}.table-content .img-text[data-v-4614bd0a]{height:60px}.table-content .img-text img[data-v-4614bd0a]{width:60px;height:60px;border:1px solid #dcdfe6;padding:4px;border-radius:2px}.table-content .img-text .text[data-v-4614bd0a]{display:inline-block;vertical-align:top;width:75%;height:60px;margin-left:3px;font-size:13px;line-height:14px;position:relative}.table-content .img-text .text .goods-descript[data-v-4614bd0a]{color:#606266;line-height:18px;font-size:14px}.table-content .img-text .text .goods-code[data-v-4614bd0a]{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-4614bd0a]{display:none;cursor:pointer}.table-content .img-text :hover .el-icon-edit-outline[data-v-4614bd0a]{display:inline-block;cursor:pointer}.table-content .img-text .el-icon-edit-outline[data-v-4614bd0a]:hover{color:#2f54ed}.table-content .stock-box .el-icon-edit-outline[data-v-4614bd0a]{display:none;cursor:pointer}.table-content .stock-box:hover .el-icon-edit-outline[data-v-4614bd0a]{display:inline-block;cursor:pointer}.el-icon-edit-outline[data-v-4614bd0a]:hover{color:#2f54ed}.undeline-dash[data-v-4614bd0a]{border-bottom:1px dashed #2f54eb;font-weight:500}.spanclass[data-v-4614bd0a]{display:inline-block;line-height:32px}.hidden-data[data-v-4614bd0a]{max-width:200px;white-space:nowrap;text-overflow:ellipsis;overflow:hidden}.stock-box .el-tooltip__popper{width:150px}
\ No newline at end of file
dist/js/chunk-vendors.a6adec24.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/chunk-vendors.e1d4da3a.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/gic-card.793c061d.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/gic-card.ea6fac2d.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/gift-manage/real-gift-detail.vue
......@@ -656,10 +656,12 @@ export default {
giftSkuStrand: skuList[i].giftSkuStrand,
giftId: skuList[i].giftId
});
for (let j = 0; j < JSON.parse(skuList[i].giftSkuStrand).length; j++) {
mapData[i].id.push(JSON.parse(skuList[i].giftSkuStrand)[j].specStandardValueId);
if(skuList[i].giftSkuStrand){
for (let j = 0; j < JSON.parse(skuList[i].giftSkuStrand).length; j++) {
mapData[i].id.push(JSON.parse(skuList[i].giftSkuStrand)[j].specStandardValueId);
}
mapData[i].mapId = mapData[i].id.join('_');
}
mapData[i].mapId = mapData[i].id.join('_');
}
for (let item of mapData) {
skuSellObj[item.mapId] = {
......@@ -1320,7 +1322,7 @@ export default {
// if(this.btnLoading) return;
if (this.goodsStandardInfo.length > 0) {
for (let item of this.goodsStandardInfo) {
if (item.specStandardId == '') {
if (item.specId == '') {
this.$message.error('请选择规格');
return false;
}
......
src/views/gift-manage/real-gift.vue
......@@ -62,7 +62,9 @@
<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">
<span class="inline-block hidden-data" :title="scope.row.giftName">{{ scope.row.giftName || '--' }}</span>
<el-tooltip class="item" effect="dark" :content="scope.row.giftName" placement="top">
<span class="inline-block hidden-data">{{ scope.row.giftName || '--' }}</span>
</el-tooltip>
<el-popover placement="top" trigger="hover" @show="getName(scope.row.giftName)">
<div>
<dm-input style="width:260px" type="text" v-model="changeName" :byte-type="1" :maxlength="30"> </dm-input>
......@@ -679,6 +681,7 @@ export default {
line-height: 14px;
position: relative;
.goods-descript {
display: flex;
color: #606266;
line-height: 18px;
font-size: 14px;
......@@ -728,7 +731,7 @@ export default {
line-height: 32px;
}
.hidden-data{
max-width: 200px;
max-width: 180px;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
......
src/views/gift-manage/real-stock-list.vue
......@@ -10,7 +10,7 @@ export default {
stockList
},
created() {
this.$emit('updateBread', [ { breadName: '礼品管理' }, { breadName: '实物礼品', breadPath: '/gift-manage/real-gift' }, { breadName: '库存记录' } ]);
this.$emit('updateBread', [ { breadName: '福利中心' }, { breadName: '礼品管理' }, { breadName: '实物礼品', breadPath: '/gift-manage/real-gift' }, { breadName: '库存记录' } ]);
}
};
</script>
src/views/gift-manage/virtual-gift.vue
......@@ -61,7 +61,9 @@
<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">
<span class="inline-block hidden-data" :title="scope.row.giftName">{{ scope.row.giftName }}</span>
<el-tooltip class="item" effect="dark" :content="scope.row.giftName" placement="top">
<span class="inline-block hidden-data">{{ scope.row.giftName || '--' }}</span>
</el-tooltip>
<el-popover placement="top" trigger="click" @show="getName(scope.row.giftName)">
<div>
<dm-input style="width:260px" type="text" v-model="changeName" :byte-type="1" :maxlength="30"> </dm-input>
......@@ -747,6 +749,7 @@ export default {
line-height: 14px;
position: relative;
.goods-descript {
display: flex;
color: #606266;
line-height: 18px;
font-size: 14px;
......@@ -796,7 +799,7 @@ export default {
line-height: 32px;
}
.hidden-data{
max-width: 200px;
max-width: 180px;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
......
src/views/gift-manage/virtual-stock-list.vue
......@@ -10,7 +10,7 @@ export default {
stockList
},
created() {
this.$emit('updateBread', [ { breadName: '礼品管理' }, { breadName: '虚拟礼品', breadPath: '/gift-manage/virtual-gift' }, { breadName: '库存记录' } ]);
this.$emit('updateBread', [ { breadName: '福利中心' }, { breadName: '礼品管理' }, { breadName: '虚拟礼品', breadPath: '/gift-manage/virtual-gift' }, { breadName: '库存记录' } ]);
}
};
</script>
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