@@ -838,7 +838,7 @@
/>
-
+
@@ -1293,7 +1293,7 @@
v-for="item in merSpecsSelect"
:key="item.value"
:label="item.label"
- :value="item.value"
+ :value="item.value"
/>
{
this.$message.error(res.message)
})
- },
+ },
// 配置
productCon() {
productConfigApi()
@@ -2088,7 +2094,7 @@ export default {
{ value: '1', name: '到店自提' },
{ value: '2', name: name }
]
- }
+ }
} else {
if (this.deliveryType.length == 1 && this.deliveryType[0] == '1' && this.formValidate.type != 2) {
this.deliveryList = [{ value: '1', name: '到店自提' }]
@@ -2137,7 +2143,7 @@ export default {
// .catch((res) => {
// this.$message.error(res.message)
// })
- }
+ }
},
// 选择店铺推荐商品
openRecommend(){
@@ -2205,7 +2211,7 @@ export default {
},
//添加卡密
addVirtual(index, name) {
- this.$refs.addCarMy.carMyShow = true;
+ this.$refs.addCarMy.carMyShow = true;
this.tabIndex = index;
this.tabName = name;
this.virtualListClear();
@@ -2227,10 +2233,10 @@ export default {
this[this.tabName][this.tabIndex]['cdkey'].key = '';
}
this.$set(this[this.tabName][this.tabIndex]['cdkey'],"is_type",e.is_type);
- this.$refs.addCarMy.carMyShow = false;
+ this.$refs.addCarMy.carMyShow = false;
},
closeCarMy(){
- this.$refs.addCarMy.carMyShow = false;
+ this.$refs.addCarMy.carMyShow = false;
},
//清空卡密
virtualListClear(){
@@ -2250,7 +2256,7 @@ export default {
is_type: 0,
key:'',
stock:0
- }
+ }
if (data.cdkey && data.cdkey.list && data.cdkey.list.length && data.cdkey.is_type == 1) {
this.$refs.addCarMy.fixedCar.is_type = 1;
this.virtualList = data.cdkey.list;
@@ -2314,6 +2320,7 @@ export default {
const rep4 = {
image: '',
price: 0,
+ wholesale_price: 0,
cost: 0,
ot_price: 0,
select: true,
@@ -2351,6 +2358,7 @@ export default {
res[kk] = {
image: '',
price: 0,
+ wholesale_price: 0,
cost: 0,
ot_price: 0,
select: true,
@@ -2369,12 +2377,13 @@ export default {
})
})
})
- data.push(dataArr.join('$&'))
+ data.push(dataArr.join('$&'))
}
if(that.generateArr.length>0){
that.generateArr.forEach((v, i) => {
res[i]['image'] = v.pic
res[i]['price'] = v.price
+ res[i]['wholesale_price'] = v.wholesale_price
res[i]['cost'] = v.cost
res[i]['ot_price'] = v.ot_price
res[i]['sku'] = v.sku
@@ -2468,7 +2477,7 @@ export default {
confirm() {
if (!this.selectRule) {
return this.$message.warning('请选择属性')
- }
+ }
this.ruleList.forEach(item => {
if (item.attr_template_id === this.selectRule) {
this.formValidate.attr = item.template_value
@@ -2617,6 +2626,7 @@ export default {
this.formThead.svip_price = { title: "付费会员价" }
this.attrVal = {
price: null,
+ wholesale_price: null,
cost: null,
ot_price: null,
svip_price: null,
@@ -2638,6 +2648,7 @@ export default {
delete this.formThead.svip_price
this.attrVal = {
price: null,
+ wholesale_price: null,
cost: null,
ot_price: null,
stock: null,
@@ -2679,6 +2690,7 @@ export default {
if(this.oneFormBatch[0].attr!= '')this.$set(val, 'attr', this.oneFormBatch[0].attr)
if(this.oneFormBatch[0].image!= '')this.$set(val, 'image', this.oneFormBatch[0].image)
if(this.oneFormBatch[0].price!= null && this.oneFormBatch[0].price!= '')this.$set(val, 'price', this.oneFormBatch[0].price)
+ if(this.oneFormBatch[0].wholesale_price!= null && this.oneFormBatch[0].wholesale_price!= '')this.$set(val, 'wholesale_price', this.oneFormBatch[0].wholesale_price)
if(this.oneFormBatch[0].cost!= null && this.oneFormBatch[0].cost!= '')this.$set(val, 'cost', this.oneFormBatch[0].cost)
if(this.oneFormBatch[0].ot_price!= null && this.oneFormBatch[0].ot_price!= '')this.$set(val, 'ot_price', this.oneFormBatch[0].ot_price)
if(this.oneFormBatch[0].svip_price!= null && this.oneFormBatch[0].svip_price!= '')this.$set(val, 'svip_price', this.oneFormBatch[0].svip_price)
@@ -2698,7 +2710,7 @@ export default {
}else if(this.oneFormBatch[0]['cdkey'].key){
this.$set(val.cdkey, "key", this.oneFormBatch[0]['cdkey'].key);
}
- this.$set(val.cdkey, "is_type",this.oneFormBatch[0]['cdkey'].is_type);
+ this.$set(val.cdkey, "is_type",this.oneFormBatch[0]['cdkey'].is_type);
}
}
}
@@ -2784,7 +2796,7 @@ export default {
if (this.$route.params.id !== "0") {
this.addmanyData(info.value);
}
- if (!this.$route.params.id && this.formValidate.spec_type === 1) {
+ if (!this.$route.params.id && this.formValidate.spec_type === 1) {
this.ManyAttrValue.map((item) => {
item.image = this.formValidate.is_copy!=1 ? this.formValidate.slider_image[0] : item.pic;
// this.$set(item, 'select', true)
@@ -2882,6 +2894,7 @@ export default {
if (info.svip_price_type != 0 && info.mer_svip_status)
this.attrVal = {
price: null,
+ wholesale_price: null,
cost: null,
ot_price: null,
svip_price: null,
@@ -2896,7 +2909,7 @@ export default {
}
if (this.formValidate.spec_type === 0) {
info.attrValue[0].list = [],
- this.OneattrValue = info.attrValue;
+ this.OneattrValue = info.attrValue;
} else {
this.ManyAttrValue = info.attrValue;
if(info.is_copy){
@@ -3224,10 +3237,10 @@ export default {
.seeCatMy {
color: var(--prev-color-primary);
cursor: pointer;
-}
+}
.selectOn{
color: var(--prev-color-primary);
-}
+}
.virtual_boder {
border: 1px solid var(--prev-color-primary);
}