From b075e99a05e05649d24ed59a74cae29fc3192875 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期日, 10 十一月 2024 22:20:30 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web

---
 ruoyi-ui/src/views/contacts/contactsInfo.vue |   28 +++++++++++++++++++++-------
 1 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/ruoyi-ui/src/views/contacts/contactsInfo.vue b/ruoyi-ui/src/views/contacts/contactsInfo.vue
index 03a3f58..a0182a4 100644
--- a/ruoyi-ui/src/views/contacts/contactsInfo.vue
+++ b/ruoyi-ui/src/views/contacts/contactsInfo.vue
@@ -169,7 +169,7 @@
           ></video>
           <img v-else
                class="el-upload-list__item-thumbnail"
-               src="../../assets/401_images/401.gif"
+               src="../../assets/images/deviceLis.png"
                alt=""
                style="width: 147px; height: 147px"
                fit="cover">
@@ -361,12 +361,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