|
@@ -132,7 +132,8 @@
|
|
|
bordered>
|
|
|
<!-- 促销时间 -->
|
|
|
<template slot="promotionTime" slot-scope="text, record">
|
|
|
- <span>{{ record.promotion.promotionDateStart }}-{{ record.promotion.promotionDateEnd }}</span>
|
|
|
+ <span v-if="record.promotion && record.promotion.promotionDateStart">{{ record.promotion.promotionDateStart }}-{{ record.promotion.promotionDateEnd }}</span>
|
|
|
+ <span v-else>--</span>
|
|
|
</template>
|
|
|
<!-- 规则 -->
|
|
|
<template slot="promotionDesc" slot-scope="text, record">
|
|
@@ -141,7 +142,8 @@
|
|
|
</template>
|
|
|
<!-- 地区 -->
|
|
|
<template slot="addressInfo" slot-scope="text, record">
|
|
|
- <span>{{ record.provinceName }}{{ record.cityName?'/'+record.cityName:'' }}{{ record.districtName?'/'+record.districtName :'' }}</span>
|
|
|
+ <span v-if="record.provinceName">{{ record.provinceName }}{{ record.cityName?'/'+record.cityName:'' }}{{ record.districtName?'/'+record.districtName :'' }}</span>
|
|
|
+ <span v-else>--</span>
|
|
|
</template>
|
|
|
<template slot="footer">
|
|
|
<a-row>
|