From a1aa9e19a73c7191f1c3d2b5a8c181ddb9013937 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期六, 18 五月 2024 18:22:55 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web

---
 ruoyi-ui/src/views/self/memoInfo.vue |   26 ++++++++++++++++++++------
 1 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/ruoyi-ui/src/views/self/memoInfo.vue b/ruoyi-ui/src/views/self/memoInfo.vue
index dbcffcb..41fe955 100644
--- a/ruoyi-ui/src/views/self/memoInfo.vue
+++ b/ruoyi-ui/src/views/self/memoInfo.vue
@@ -310,12 +310,26 @@
                 let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
         //	alert(pth)
                 if (_this.fot.includes(pth) === true)
-        	{
-        		if(paths[i][0]=="/")
-                  _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
-        	  else
-        	     _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
-        	  }
+        	// {
+        	// 	if(paths[i][0]=="/")
+         //          _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
+        	//   else
+        	//      _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
+        	//   }
+          {
+            if(paths[i].includes(process.env.VUE_APP_BASE_TRUE_API)){
+              if(paths[i][0]=="/")
+                    _this.fileList.push({name:paths[i],url: paths[i].substr(1),res:false})
+              else
+                 _this.fileList.push({name:paths[i],url: paths[i],res:false})
+            }else{
+              if(paths[i][0]=="/")
+                    _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
+              else
+                 _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
+            }
+
+            }
                 else {
                   // alert(paths[i])
         	 // alert()

--
Gitblit v1.9.1