Skip to content

W
welfare
Commit 1f4eeb8a by 萱草
Options

update: 更新

parent cdadfca3
Showing with 67 additions and 31 deletions
dist/css/chunk-19510fda.b1be7ebb.css deleted 100644 → 0
.transfer-trigger[data-v-7d6a41ba]{margin-left:10px;width:160px}.transfer-trigger[data-v-7d6a41ba]:before{content:"";position:absolute;top:0;right:0;bottom:0;left:0;z-index:1;width:100%;height:100%;background:transparent;cursor:pointer}.transfer-trigger[data-v-7d6a41ba]:focus{outline:none}.transfer-trigger.is-focus[data-v-7d6a41ba] .el-input__inner{border-color:#2f54eb;-webkit-box-shadow:0 0 0 2px rgba(47,84,237,.2);box-shadow:0 0 0 2px rgba(47,84,237,.2)}.transfer-trigger.is-focus .el-input__icon[data-v-7d6a41ba]{-webkit-transform:rotate(-180deg);transform:rotate(-180deg)}.transfer[data-v-7d6a41ba] .el-transfer-panel__item{padding-top:8px;padding-bottom:8px;width:100%;height:auto;line-height:normal}.transfer[data-v-7d6a41ba] .el-transfer-panel__item .el-checkbox__input{top:10px}.transfer[data-v-7d6a41ba] .el-transfer-panel__empty:before{content:"";display:block;margin:0 auto;width:30px;height:30px;background:url([object Module]) 50% no-repeat;background-size:contain}.transfer[data-v-7d6a41ba] .el-transfer-panel__header{pointer-events:none}.transfer[data-v-7d6a41ba] .el-transfer-panel__header .el-checkbox__input{display:none}.transfer .transfer-item[data-v-7d6a41ba]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start}.transfer .transfer-item .store-name[data-v-7d6a41ba]{width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font-size:14px;font-weight:400;color:#303133;line-height:22px}.transfer .transfer-item .store-code[data-v-7d6a41ba]{font-size:12px;font-weight:400;color:#303133;line-height:16px}.transfer[data-v-7d6a41ba] .el-transfer__buttons .el-button{padding:0;width:24px;min-width:24px}.transfer[data-v-7d6a41ba] .el-transfer__buttons .el-button:first-child{margin-bottom:0;-webkit-transform:translateY(calc(100% + 4px));transform:translateY(calc(100% + 4px))}.transfer[data-v-7d6a41ba] .el-transfer__buttons .el-button:last-child{-webkit-transform:translateY(-100%);transform:translateY(-100%)}.pickup-upload[data-v-7d6a41ba]{display:inline-block;vertical-align:top;margin-left:10px}.pickup-upload .upload-trigger[data-v-7d6a41ba]{border-style:dashed}.pickup-upload .upload-trigger .upload-icon[data-v-7d6a41ba]{font-size:14px}.pickup-upload .upload-tip[data-v-7d6a41ba]{display:inline-block}.pickup-upload .pickup-list[data-v-7d6a41ba]{margin-top:18px}.pickup-upload .pickup-list .pickup-list-name[data-v-7d6a41ba]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.pickup-upload .pickup-list .pickup-list-name .file-icon[data-v-7d6a41ba]{font-size:14px}.pickup-upload .pickup-list .download-pickup[data-v-7d6a41ba]{margin-left:8px}.pickup-upload .pickup-list .pickup-list-total[data-v-7d6a41ba]{margin-top:8px;font-size:12px;font-weight:400;color:#909399;line-height:17px}.pickup-upload .pickup-list .pickup-list-total .pickup-list-error[data-v-7d6a41ba],.pickup-upload .pickup-list .pickup-list-total .pickup-list-number[data-v-7d6a41ba],.pickup-upload .pickup-list .pickup-list-total .pickup-list-success[data-v-7d6a41ba]{padding:0 5px}.pickup-upload .pickup-list .pickup-list-total .pickup-list-number[data-v-7d6a41ba]{color:#303133}.pickup-upload .pickup-list .pickup-list-total .pickup-list-success[data-v-7d6a41ba]{color:#33af4a}.pickup-upload .pickup-list .pickup-list-total .pickup-list-error[data-v-7d6a41ba]{color:#f5222d}.upload-tip-text[data-v-7d6a41ba]{width:308px}.upload-tip-text p[data-v-7d6a41ba]{font-size:12px;font-weight:400;color:#303133;line-height:16px}.upload-tip-text p+p[data-v-7d6a41ba]{margin-top:9px}.error-item[data-v-7d6a41ba]{font-size:14px;font-weight:400;color:#303133;line-height:20px}.error-item+.error-item[data-v-7d6a41ba]{margin-top:10px}.error-list[data-v-7d6a41ba] .el-dialog__body{max-height:400px;overflow-y:auto}.upload-popper{padding:10px 12px!important}.transfer-tip{width:auto!important}.dash-style[data-v-d9e90ca4]{border-bottom:1px dashed #2f54eb}.w-630[data-v-d9e90ca4]{width:630px}.w-480[data-v-d9e90ca4]{width:480px}.w-350[data-v-d9e90ca4]{width:350px}.w-900[data-v-d9e90ca4]{width:900px}.mb56[data-v-d9e90ca4]{margin-bottom:56px}.from-content[data-v-d9e90ca4]{position:relative}.from-content .demo-ruleForm .form-section[data-v-d9e90ca4]{padding:30px 20px}.from-content .demo-ruleForm .form-section h3[data-v-d9e90ca4]{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-d9e90ca4]: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-d9e90ca4]{color:#909399;font-size:12px}.from-content .demo-ruleForm .form-section .tip-warm i[data-v-d9e90ca4]{color:#faad14;margin-right:5px}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list[data-v-d9e90ca4]{width:900px;margin-bottom:20px}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item[data-v-d9e90ca4]{width:100%}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .sku-name[data-v-d9e90ca4]{padding:8px;background:#f3f6f9;position:relative}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .sku-name .sku-title[data-v-d9e90ca4]{color:#909399;margin-right:7px}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .sku-name .sku-value-title[data-v-d9e90ca4]{color:#909399;width:55px}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .sku-name .delete-btn[data-v-d9e90ca4]{color:#909399;font-size:14px;position:absolute;right:20px;cursor:pointer}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .sku-name .delete-btn[data-v-d9e90ca4]:hover{color:#2f54ed}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .value-content[data-v-d9e90ca4]{padding:15px 8px 5px 8px;display:-webkit-box;display:-ms-flexbox;display:flex}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .value-content .sku-value-title[data-v-d9e90ca4]{color:#909399;width:55px}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .value-content .value-list[data-v-d9e90ca4]{display:inline-block;-webkit-box-flex:1;-ms-flex:1;flex:1}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .value-content .value-list .value-item[data-v-d9e90ca4]{border:1px solid #e4e7ed;padding:10px 8px;border-radius:4px;display:inline-block;margin-right:7px;position:relative;margin-bottom:10px}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .value-content .value-list .value-item .el-icon-error[data-v-d9e90ca4]{font-size:16px;position:absolute;right:-10px;top:-5px;color:#c0c4cc;display:none;cursor:pointer}.from-content .demo-ruleForm .form-section .standard-info .add-sku-list .add-sku-item .value-content .value-list .value-item:hover .el-icon-error[data-v-d9e90ca4]{display:inline-block;color:#909399}.from-content .demo-ruleForm .form-section .standard-info .sku-table-content[data-v-d9e90ca4]{padding:10px;width:900px;border:1px solid #dcdfe6;border-radius:2px}.from-content .demo-ruleForm .form-section .standard-info .sku-table-content .batch-box[data-v-d9e90ca4]{padding-left:130px;font-size:0;height:40px}.from-content .demo-ruleForm .fixed-btn[data-v-d9e90ca4]{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-d9e90ca4]{margin-top:12px}.from-content .anchor-link[data-v-d9e90ca4]{width:120px;position:fixed;right:24px;top:180px;background:#fff}.from-content .anchor-link .link-item[data-v-d9e90ca4]{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-d9e90ca4]{color:#909399;margin-left:15px}.from-content .see-btn[data-v-d9e90ca4]:hover{color:#2f54ed}.ml20[data-v-d9e90ca4]{margin-left:20px}.mr10[data-v-d9e90ca4]{margin-right:10px}.mr16[data-v-d9e90ca4]{margin-right:16px}.table-img[data-v-d9e90ca4]{display:inline-block;width:32px;height:32px;border-radius:4px;border:1px dashed #d9d9d9;cursor:pointer;text-align:center;vertical-align:top;position:relative}.table-img img[data-v-d9e90ca4]{width:30px;height:30px}.table-img[data-v-d9e90ca4]:hover{border:1px dashed #2f54ed}.img-modal[data-v-d9e90ca4]{width:32px;height:32px;position:absolute;left:-1px;top:-1px;background:rgba(0,0,0,.5);display:none;cursor:pointer;border-radius:4px}.img-modal .el-icon-delete[data-v-d9e90ca4]{color:#fff}.table-img:hover .img-modal[data-v-d9e90ca4]{display:inline-block}.tips-content[data-v-d9e90ca4]{position:absolute;left:-4px;top:8px}.store-tips[data-v-d9e90ca4]{width:200px;position:absolute;left:-10px}.sku-table th.star div:before{content:"*";color:red}.right-border{border-right:1px solid #ebeef5}.sku-table-content .sku-table th{line-height:17px!important}
\ No newline at end of file
dist/js/chunk-vendors.4a0b36ab.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.98343337.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/gic-card.d709790b.js 0 → 100644
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
......@@ -30,14 +30,14 @@
<span class="sku-title">规格名</span>
<span style="display:none">{{ refash }}</span>
<el-dropdown trigger="click" placement="bottom-start" @command="i => getSelected(i, item)">
<el-input v-model="item.specName" style="width:200px" size="smalll" placeholder="请选择" @input="value => spliceStandard(value, item)" @focus="getStdList(item)" @blur="addStandard(item)"></el-input>
<el-input v-model="item.specName" style="width:100px" size="smalll" placeholder="请选择" @input="value => spliceStandard(value, item)" @focus="getStdList(item)" @blur="addStandard(item)"></el-input>
<el-dropdown-menu slot="dropdown" style="height:300px;overflow-y:auto;min-width:200px;">
<el-dropdown-item style="width:200px" :command="i" v-for="i in standardList" :key="i.specId">{{ i.specName }}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<el-checkbox v-model="isStdImg" v-if="!index" class="ml20" @change="stdImgUpload">添加图片</el-checkbox>
<span class="tip-warm ml20" v-if="!index">只有第一个规格的规格值可添加图片</span>
<span class="delete-btn" @click="deleteSku(index)">删除</span>
<el-checkbox v-model="isStdImg" v-if="!index" class="ml20" @change="stdImgUpload">添加规格图片</el-checkbox>
<!-- <span class="tip-warm ml20" v-if="!index">只有第一个规格的规格值可添加图片</span> -->
<span class="delete-btn" @click="deleteSku(index)"><i class="el-icon-error inline-block" style="width:14px;height:14px;"></i></span>
</div>
<div class="value-content" v-if="item.specName">
<span class="sku-value-title">规格值</span>
......@@ -45,30 +45,37 @@
<div class="value-list">
<div class="value-item" v-for="(v, n) in item.valueList" :key="n">
<el-dropdown trigger="click" placement="bottom-start" @command="i => getSelectedValue(i, item, n)">
<el-input v-model="v.specStandardValueName" style="width:200px" size="smalll" placeholder="请选择" @input="value => spliceStandardValue(value, item)" @focus="getStdValueList(value, item)" @blur="addStandardValue(item, n)"></el-input>
<el-input v-model="v.specStandardValueName" style="width:160px" size="smalll" placeholder="请选择" @input="value => spliceStandardValue(value, item)" @focus="getStdValueList(value, item)" @blur="addStandardValue(item, n)"></el-input>
<el-dropdown-menu slot="dropdown" style="height:300px;overflow-y:auto;min-width:200px;">
<el-dropdown-item style="width:200px" :command="m" v-for="m in standardValueList" :key="m.specValueId">{{ m.specValue }}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<div class="table-img ml10" v-if="!index && isStdImg">
<div class="table-img" v-if="!index && isStdImg">
<el-upload class="avatar-uploader" :action="uploadAction" :show-file-list="false" with-credentials :on-success="(response, file, fileList) => tableUploadSuccess(response, file, fileList, v)" :before-upload="tableBeforeUpload">
<img v-if="v.propImg" :src="v.propImg" class="avatar" />
<i v-else class="el-icon-plus avatar-uploader-icon"></i>
<i v-else class="el-icon-plus avatar-uploader-icon" style="font-size:28px"></i>
</el-upload>
<p class="img-modal" v-if="v.propImg">
<i class="el-icon-delete" @click="deleteImg(v)"></i>
</p>
<p style="font-size:12px;color:#FF5152;position:absolute;bottom:-32px">请添加规格图片</p>
</div>
<span class="el-icon-error" @click="deleteValue(item, v, index, n)"></span>
</div>
<el-button type="text" @click="addValue(item)">添加规格值</el-button>
<p v-if="!index && isStdImg" style="font-size: 12px; color: rgb(144, 147, 153);">图片宽度≥200px，建议宽高比1:1，单张图片大小不超过2MB</p>
<p v-if="!index && isStdImg" style="font-size: 12px; color: rgb(144, 147, 153);margin-top:129px">仅支持为第一组规格设置规格图片，买家选择不同规格会看到对应规格图片，建议尺寸 800*800px。</p>
</div>
</div>
</div>
</div>
<div style="margin-bottom:20px">
<el-button v-show="goodsStandardInfo.length < 3" @click="addSku" type="primary">添加规格</el-button>
<div class="add-sku-content">
<div class="add-sku">
<div class="add-sku-button">
<el-button v-show="goodsStandardInfo.length < 3" @click="addSku" type="text">添加规格项目</el-button>
</div>
</div>
</div>
<p class="tip-warm w-900">如有颜色、尺码等多种规格，请添加规格</p>
</div>
<div class="sku-table-content" v-if="goodsSkuList.length > 0 && goodsStandardInfo.length > 0">
......@@ -390,6 +397,7 @@ export default {
skuCols: [],
stValCount: [],
skuSellObj: {},
skuSellObj2: {},
stockObj: {},
isStdImg: false,
cordList: [], // 礼品分类
......@@ -1092,6 +1100,7 @@ export default {
}
}
this.skuSellObj = deepClone(this.skuSellObj);
this.skuSellObj2 = deepClone(this.skuSellObj);
this.refash = !this.refash;
},
combine(arr) {
......@@ -1161,7 +1170,7 @@ export default {
this.goodsForm.costPrice = min + '~' + max;
}
}else if(arr1.length === 1){
this.goodsForm.costPrice = this.skuSellObj[0].giftSkuCostPrice;
this.goodsForm.costPrice = this.skuSellObj[key].giftSkuCostPrice;
// this.goodsForm.spuList[0].costPrice = this.skuSellObj[0].giftSkuCostPrice;
}
console.log(this.goodsForm.costPrice);
......@@ -1194,7 +1203,7 @@ export default {
this.goodsForm.stock = Number(this.goodsForm.stock) + Number(this.skuSellObj[key1].stock);
}
}else if(arr1.length === 1){
this.goodsForm.stock = this.skuSellObj[0].stock;
this.goodsForm.stock = this.skuSellObj[key].stock;
}
},
// 保存
......@@ -1245,7 +1254,7 @@ export default {
skuList.push({
giftId: this.giftId,
giftSkuId: this.skuSellObj[item].giftSkuId,
// stock: this.skuSellObj[item].stock,
stock: this.skuSellObj[item].stock,
giftSkuCode: this.skuSellObj[item].giftSkuCode,
skuBarCode: this.skuSellObj[item].skuBarCode,
giftSkuCostPrice: this.skuSellObj[item].giftSkuCostPrice,
......@@ -1376,6 +1385,27 @@ export default {
.mb56 {
margin-bottom: 56px;
}
.add-sku-content{
border: 1px solid #E4E7ED;
.add-sku{
margin: 10px 13px;
padding-top: 12px;
padding-left: 12px;
padding-bottom: 12px;
background: #F7F8FA;
.add-sku-button{
// display: inline-block;
width: 110px;
height: 32px;
background: #FFFFFF;
border-radius: 2px;
border: 1px dashed #C4C6CF;
text-align: center;
// margin-top: 12px;
// margin-left: 21px;
}
}
}
.from-content {
position: relative;
.demo-ruleForm {
......@@ -1454,18 +1484,14 @@ export default {
flex: 1;
.value-item {
border: 1px solid #e4e7ed;
padding: 10px 8px;
border-radius: 4px;
display: inline-block;
margin-right: 7px;
margin-right: 10px;
position: relative;
margin-bottom: 10px;
.el-icon-error {
font-size: 16px;
position: absolute;
right: -10px;
top: -5px;
right: -7px;
top: -7px;
color: #c0c4cc;
display: none;
cursor: pointer;
......@@ -1544,19 +1570,29 @@ export default {
margin-right: 16px;
}
.table-img {
display: inline-block;
width: 32px;
height: 32px;
border-radius: 4px;
border: 1px dashed #d9d9d9;
cursor: pointer;
text-align: center;
vertical-align: top;
position: relative;
// text-align: center;
// vertical-align: top;
position: absolute;
top: 44px;
left: 0;
width: 90px;
height: 90px;
background: #FFFFFF;
border-radius: 4px;
border: 1px solid #FF5152;
.avatar-uploader{
// margin-top: 35px;
text-align: center;
.avatar-uploader-icon{
margin-top: 30px;
}
}
}
.table-img img {
width: 30px;
height: 30px;
width: 88px;
height: 88px;
border-radius: 4px;
}
.table-img:hover {
border: 1px dashed #2f54ed;
......@@ -1571,9 +1607,11 @@ export default {
display: none;
cursor: pointer;
border-radius: 4px;
text-align: center;
}
.img-modal .el-icon-delete {
color: #fff;
margin-top: 42px;
}
.table-img:hover .img-modal {
display: inline-block;
......
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