From 90b6b8c9e342d07e8a7121d732900287d997a8b6 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期一, 03 三月 2025 22:57:35 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web

---
 ruoyi-ui/src/views/pet/noteInfo.vue |   44 +++++++++++++++++++++++++++++---------------
 1 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/ruoyi-ui/src/views/pet/noteInfo.vue b/ruoyi-ui/src/views/pet/noteInfo.vue
index 079165a..883fa48 100644
--- a/ruoyi-ui/src/views/pet/noteInfo.vue
+++ b/ruoyi-ui/src/views/pet/noteInfo.vue
@@ -114,7 +114,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">
@@ -197,7 +197,6 @@
       isShow:true,
       uploading: false,
       formData: {
-
         type: undefined,
         title: undefined,
         location: undefined,
@@ -277,12 +276,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()
@@ -342,13 +355,13 @@
           }
     },
     submitForm() {
-      let ul = this.fileList.map(function (elem){
-        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
-      }).join(",")
-      let uls = this.fileListOther.map(function (elem){
-        return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
-      }).join(",")
-      this.formData.url = ul+","+uls
+      // let ul = this.fileList.map(function (elem){
+      //   return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+      // }).join(",")
+      // let uls = this.fileListOther.map(function (elem){
+      //   return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+      // }).join(",")
+      // this.formData.url = ul+","+uls
 
       this.$refs['elForm'].validate(valid => {
 
@@ -469,6 +482,7 @@
      		uls = uls +","+elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
        })
        this.formData.url = ul+","+uls;
+       console.log(this.formData,'formDataformDataformDataformDataformDataformDataformData')
        if(res==true){
      	  updatenotePet(this.formData).then(response => {
      		this.$modal.msgSuccess("鍒犻櫎鎴愬姛");

--
Gitblit v1.9.1