|
@@ -28,7 +28,11 @@
|
|
|
<el-col :span="24" class="shop"> <i class="el-icon-s-shop"></i>{{ shop.name }}</el-col>
|
|
|
<el-col :span="24" v-for="(item, index) in list" :key="index">
|
|
|
<el-col :span="24" class="goods bode">
|
|
|
- <el-col :span="6"><el-image :src="item.goods.file[0].url"></el-image></el-col>
|
|
|
+ <el-col :span="6" v-if="item.file && item.file.length != 0"><el-image class="image" :src="item.file[0].url"></el-image></el-col>
|
|
|
+ <el-col :span="6" v-else-if="item.goods && item.goods.file && item.file.goods.length != 0"
|
|
|
+ ><el-image class="image" :src="item.goods.file[0].url"></el-image
|
|
|
+ ></el-col>
|
|
|
+ <el-col :span="6" v-else><el-image class="image" :src="item.url"></el-image></el-col>
|
|
|
<el-col :span="18">
|
|
|
<el-col :span="12">
|
|
|
<el-col>
|
|
@@ -76,7 +80,7 @@
|
|
|
<el-col :span="24" class="goods_total bode">
|
|
|
<el-col :span="6">快递费</el-col>
|
|
|
<el-col :span="18" class="other">
|
|
|
- <p>¥{{ total_detail.freight_total }}</p>
|
|
|
+ <p>¥{{ total_detail.freight_total || '0' }}</p>
|
|
|
</el-col>
|
|
|
</el-col>
|
|
|
<el-col :span="24" class="goods_total bode">
|
|
@@ -368,6 +372,9 @@ export default {
|
|
|
}
|
|
|
.goods {
|
|
|
padding: 10px 0;
|
|
|
+ .image {
|
|
|
+ padding: 0 10px 0 0;
|
|
|
+ }
|
|
|
.money {
|
|
|
text-align: right;
|
|
|
}
|