Merge branch 'test' into spike
This commit is contained in:
commit
d9ffdc7fdb
|
@ -4503,7 +4503,11 @@ export default {
|
||||||
this.oneFormBatch[0].image || this.formValidate.slider_image[0];
|
this.oneFormBatch[0].image || this.formValidate.slider_image[0];
|
||||||
}
|
}
|
||||||
this.ManyAttrValue.map(item => {
|
this.ManyAttrValue.map(item => {
|
||||||
let proportion = this.formValidate.is_benefit ? "0.45" : "0.60";
|
let proportion = this.formValidate.is_benefit
|
||||||
|
? "0.45"
|
||||||
|
: this.$route.params.id
|
||||||
|
? item.proportion
|
||||||
|
: "0.60";
|
||||||
let obj = this.proportionList.find(
|
let obj = this.proportionList.find(
|
||||||
items => items.value == proportion
|
items => items.value == proportion
|
||||||
);
|
);
|
||||||
|
@ -4708,7 +4712,6 @@ export default {
|
||||||
if (info.is_copy) {
|
if (info.is_copy) {
|
||||||
this.formValidate.value = info.value;
|
this.formValidate.value = info.value;
|
||||||
}
|
}
|
||||||
console.log(this.ManyAttrValue);
|
|
||||||
this.generate();
|
this.generate();
|
||||||
}
|
}
|
||||||
// if (this.formValidate.spec_type === 0) {
|
// if (this.formValidate.spec_type === 0) {
|
||||||
|
@ -4725,7 +4728,9 @@ export default {
|
||||||
this.checkboxGroup.push("is_good");
|
this.checkboxGroup.push("is_good");
|
||||||
}
|
}
|
||||||
this.OneattrValue.map(item => {
|
this.OneattrValue.map(item => {
|
||||||
let proportion = this.formValidate.is_benefit ? "0.45" : "0.60";
|
let proportion = this.formValidate.is_benefit
|
||||||
|
? "0.45"
|
||||||
|
: item.proportion;
|
||||||
|
|
||||||
let obj = this.proportionList.find(items => items.value == proportion);
|
let obj = this.proportionList.find(items => items.value == proportion);
|
||||||
let growth = this.formValidate.is_benefit
|
let growth = this.formValidate.is_benefit
|
||||||
|
|
Loading…
Reference in New Issue