diff --git a/web/client/src/sections/quanju/containers/footer/conserve/right/right-top.js b/web/client/src/sections/quanju/containers/footer/conserve/right/right-top.js index 804e442c..a4114c20 100644 --- a/web/client/src/sections/quanju/containers/footer/conserve/right/right-top.js +++ b/web/client/src/sections/quanju/containers/footer/conserve/right/right-top.js @@ -89,7 +89,12 @@ const RightTop = (props) => {
{ - item.conserveAfterPic && item.conserveAfterPic.length ? + (item.conserveAfterPic && item.conserveAfterPic.length) + || + (item.conserveBeforePic && item.conserveBeforePic.length) + || + (item.conserveUnderwayPic && item.conserveUnderwayPic.length) + ? {
{ - item.conserveAfterPic && item.conserveAfterPic.length ? - : '' + }
diff --git a/web/client/src/sections/quanju/containers/footer/leadership/centerleft/hudong.js b/web/client/src/sections/quanju/containers/footer/leadership/centerleft/hudong.js index a78f90fc..ab842b11 100644 --- a/web/client/src/sections/quanju/containers/footer/leadership/centerleft/hudong.js +++ b/web/client/src/sections/quanju/containers/footer/leadership/centerleft/hudong.js @@ -83,7 +83,6 @@ class ReactCarousel extends Component { }} />
- ) }) } diff --git a/web/client/src/sections/quanju/containers/public/olMap.js b/web/client/src/sections/quanju/containers/public/olMap.js index b8ba1c62..6f5cc9af 100644 --- a/web/client/src/sections/quanju/containers/public/olMap.js +++ b/web/client/src/sections/quanju/containers/public/olMap.js @@ -456,7 +456,7 @@ const OlMap = (props) => {
{ - pointItem.id && ((isRoadProject && pointItem.scene_pic && pointItem.scene_pic.length) || (!isRoadProject && pointItem.conserve_after_pic && pointItem.conserve_after_pic.length)) ? + pointItem.id ? { pointItem.scene_pic[0] : "" }] : [{ - "imgs": pointItem.conserve_after_pic ? + "imgs": pointItem.conserve_after_pic && pointItem.conserve_after_pic.length ? pointItem.conserve_after_pic[0] : "" }, { - "imgs": pointItem.conserve_before_pic ? + "imgs": pointItem.conserve_before_pic && pointItem.conserve_before_pic.length ? pointItem.conserve_before_pic[0] : "" }, { - "imgs": pointItem.conserve_underway_pic ? + "imgs": pointItem.conserve_underway_pic && pointItem.conserve_underway_pic.length ? pointItem.conserve_underway_pic[0] : "" }]} />