Merge branch 'linwenxin_dev' of https://gogs.zfire.top/zfire-front/zfire-newmall-admin into develop

src/views/mallManagement/setActivity/index.vue

@@ -450,7 +450,7 @@ export default {
 				defaultData.render = (h, { row, index, column }) => {
 					return (
 						<div style="padding:0 6px;cursor: pointer;">
-							{row.startTime.split(" ")[0]}
+							{row.startTime && row.startTime.split(" ")[0]}
 						</div>
 					)
 				}
@@ -459,7 +459,7 @@ export default {
 				defaultData.render = (h, { row, index, column }) => {
 					return (
 						<div style="padding:0 6px;cursor: pointer;">
-							{row.endTime.split(" ")[0]}
+							{row.endTime && row.endTime.split(" ")[0]}
 						</div>
 					)
 				}