Merge branch 'master' of http://git.huihenduo.com.cn:3000/wzh/JiangYunPhotosCargoOwner_WebApp into dhly

src/views/voyage/voyageDetail.vue

@@ -700,7 +700,7 @@
     <el-dialog v-model="mediaModal" :title="modalTitle">
       <el-image
         v-if="modalType == 1"
-        style="max-width: 80vw; max-height: 60vh; display: flex"
+        style="height: 60vh; display: flex"
         fit="contain"
         :src="currentUrl"
         :preview-src-list="modalPreview"