|
@@ -42,8 +42,10 @@
|
|
|
<el-col v-if="info.type == '4' || info.type == '5'">
|
|
|
<el-col :span="24" v-for="(item, index) in list" :key="index">
|
|
|
<el-col :span="24" class="goods bode" v-if="!item.is_set">
|
|
|
- <el-col :span="6" v-if="item.goods.file"><el-image class="image" :src="item.goods.file[0].url"></el-image></el-col>
|
|
|
- <el-col :span="6" v-else-if="item.url"><el-image class="image" :src="item.url"></el-image></el-col>
|
|
|
+ <el-col :span="6" v-if="item.goods && item.goods.file">
|
|
|
+ <el-image class="image" :src="getCheckOne(item, 'goods.file[0].url')"></el-image>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6" v-else-if="item.url"><el-image class="image" :src="getCheckOne(item, 'url')"></el-image></el-col>
|
|
|
<el-col :span="18">
|
|
|
<el-col :span="12">
|
|
|
<el-col>
|
|
@@ -63,8 +65,10 @@
|
|
|
<el-col :span="24" class="goods bode" v-if="item.is_set == '0'">
|
|
|
<el-col :span="24">{{ item.name || '套装名称' }}</el-col>
|
|
|
<el-col :span="24" v-for="(i, index) in item.goods" :key="index">
|
|
|
- <el-col :span="6" class="image" v-if="i.goods.file && i.goods.file.length != 0"><el-image :src="i.goods.file[0].url"></el-image></el-col>
|
|
|
- <el-col :span="6" class="image" v-else-if="i.url"><el-image :src="i.url"></el-image></el-col>
|
|
|
+ <el-col :span="6" class="image" v-if="i.goods.file && i.goods.file.length != 0">
|
|
|
+ <el-image :src="getCheckOne(i, 'goods.file[0].url')"></el-image>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6" class="image" v-else-if="i.url"><el-image :src="getCheckOne(i, 'url')"></el-image></el-col>
|
|
|
<el-col :span="18">
|
|
|
<el-col :span="12">
|
|
|
<el-col :span="24"> {{ i.goods_name }} </el-col>
|
|
@@ -428,6 +432,9 @@ export default {
|
|
|
toBack() {
|
|
|
this.$emit('toBack');
|
|
|
},
|
|
|
+ getCheckOne(item, model) {
|
|
|
+ return _.get(item, model);
|
|
|
+ },
|
|
|
},
|
|
|
|
|
|
computed: {
|
|
@@ -440,7 +447,7 @@ export default {
|
|
|
test: {
|
|
|
deep: true,
|
|
|
immediate: true,
|
|
|
- handler(val) {},
|
|
|
+ handler(val) { },
|
|
|
},
|
|
|
},
|
|
|
};
|
|
@@ -452,35 +459,44 @@ export default {
|
|
|
font-size: 16px;
|
|
|
margin: 10px 4% 0 8%;
|
|
|
padding: 5px;
|
|
|
+
|
|
|
.add {
|
|
|
border-bottom: 2px dashed #ccc;
|
|
|
margin: 0 0 5px 0;
|
|
|
padding: 5px 0;
|
|
|
}
|
|
|
+
|
|
|
.shop {
|
|
|
padding: 4px 0;
|
|
|
font-size: 22px;
|
|
|
border-bottom: 1px solid #ccc;
|
|
|
}
|
|
|
+
|
|
|
.goods {
|
|
|
padding: 10px 0;
|
|
|
+
|
|
|
.image {
|
|
|
padding: 0 10px 0 0;
|
|
|
}
|
|
|
+
|
|
|
.money {
|
|
|
text-align: right;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
.other {
|
|
|
text-align: right;
|
|
|
+
|
|
|
p {
|
|
|
color: red;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
.el-col {
|
|
|
margin: 4px 0;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
.two {
|
|
|
margin: 0 0 0 20px;
|
|
|
}
|