From eaafe26cb6aa070b002037ede1c7de74b6b5600b Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期二, 26 三月 2024 16:41:56 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web

---
 ruoyi-ui/src/views/travel/travelInfo.vue |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/ruoyi-ui/src/views/travel/travelInfo.vue b/ruoyi-ui/src/views/travel/travelInfo.vue
index c993b20..977ca4e 100644
--- a/ruoyi-ui/src/views/travel/travelInfo.vue
+++ b/ruoyi-ui/src/views/travel/travelInfo.vue
@@ -302,12 +302,21 @@
             let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
 
             if (_this.fot.includes(pth) === true)
+			{
+				if(paths[i].includes("https"))
+				_this.fileList.push({name:paths[i],url: paths[i]})
+				else
               _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
+			  }
             else {
               // alert(paths[i])
+			  if(paths[i].includes("https"))
+			  _this.fileListOther.push({name:paths[i],url: paths[i]})
+			  else{
               let nms = paths[i].split("\/")
               let nm = nms[nms.length - 1]
               _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
+			  }
             }
           }
         }

--
Gitblit v1.9.1