From f1c72b7eb3d844a77fd8e563024e0e9cd364f530 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 20 五月 2025 21:23:09 +0800
Subject: [PATCH] 修改了bug

---
 ruoyi-ui/src/views/collection/collectionInfo.vue |  136 ++++++++++++++++++++++++++++++++------------
 1 files changed, 98 insertions(+), 38 deletions(-)

diff --git a/ruoyi-ui/src/views/collection/collectionInfo.vue b/ruoyi-ui/src/views/collection/collectionInfo.vue
index 64e55a3..319744e 100644
--- a/ruoyi-ui/src/views/collection/collectionInfo.vue
+++ b/ruoyi-ui/src/views/collection/collectionInfo.vue
@@ -60,7 +60,7 @@
              </el-col>
              <el-col >
                <el-form-item label="浠峰��" prop="price" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
-                <el-input v-model="formData.price" placeholder="璇疯緭鍏ヤ环鍊�" clearable :style="{width: '100%'}" :disabled="dsb">
+                <el-input v-model="formData.price" type="number" placeholder="璇疯緭鍏ヤ环鍊�" clearable :style="{width: '100%'}" :disabled="dsb">
                 </el-input>
               </el-form-item>
              </el-col>
@@ -86,7 +86,7 @@
             multiple
             :http-request="requestUpload"
             :file-list="fileList"
-		
+
 			:on-change="handleChange"
 			:auto-upload="false"
             :disabled="!btn"
@@ -145,7 +145,7 @@
             multiple
             list-type="picture-card"
             :on-preview="handleFileCardPreview"
-       
+
             :http-request="requestUpload1"
             :show-file-list="true"
 			:on-change="handleChange1"
@@ -167,7 +167,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">
@@ -240,14 +240,15 @@
     // 鏁版嵁鑼冨洿閫夐」
     fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
       '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
-    
+
       fileList:[],
    fileList1:[],
    uploadFileList:[],
    uploadFileList1:[],
    fileListOther:[
-   
+
    ],
+   fileListOther1:[],
       dsb:true,
       btn:false,
       isShow:true,
@@ -353,16 +354,30 @@
         for(let i = 0; i < paths.length; i++)
         {
          if(paths[i]!="") {
-         
+
              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()
@@ -372,7 +387,7 @@
                _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
          		else
          		_this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
-         		
+
          	}
            }
         }
@@ -393,6 +408,49 @@
   },
   mounted() {},
   methods: {
+    getData(){
+      const id = this.$route.params && this.$route.params.id;
+      let _this = this
+      if (id) {
+        this.loading = true;
+        getCollection(id).then((response) => {
+          this.formData = response.data;
+          let paths = response.data.url.split(",");
+          for(let i = 0; i < paths.length; i++)
+          {
+           if(paths[i]!="") {
+
+               let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
+           //	alert(pth)
+               if (_this.fot.includes(pth) === true)
+           	{
+            console.log()
+           	  }
+               else {
+                 let nms = paths[i].split("\/")
+                 let nm = nms[nms.length - 1]
+           	  if(paths[i][0]=="/")
+                 _this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i].substr(1),res:false})
+           		else
+           		_this.fileListOther1.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i],res:false})
+
+           	}
+             }
+          }
+          _this.fileListOther = _this.fileListOther1
+          this.loading = false;
+        });
+        listType(this.queryParams).then(response => {
+            this.typeList = response.data;
+            this.total = response.data.total;
+            // console.log( this.typeList )
+            // 鍦ㄥ洖璋冨嚱鏁颁腑璋冪敤 getTypeOptions()
+            this.getTypeOptions();
+            this.loading = false;
+          }
+        );
+      }
+    },
     //绫诲埆
     addNewOption() {
       const newOption = this.newOption.trim();
@@ -472,10 +530,10 @@
   			this.$delete(this.uploadFileList1, Math.abs(i - this.uploadFileList1.length-1))
   		}
         this.$delete(this.fileListOther,i);
-  
+
   	}
     }
-    
+
     let ul = ""
     this.fileList.map(function (elem){
     		if(elem.res==false)
@@ -492,11 +550,11 @@
   	  updateCollection(this.formData).then(response => {
   		this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
   		// this.open = false;
-  	  
+
   	  });
     }
   },
-  handleRemove(file) {	  
+  handleRemove(file) {
   		  //鍒ゆ柇鏄惁鏄箣鍓嶇殑鍥剧墖
     let res = false
   //  alert(this.fileList.length)
@@ -516,7 +574,7 @@
   		 	//	  alert(this.uploadFileList.length)
   		 }
         this.$delete(this.fileList,i);
-     
+
     }
     }
     let ul = ""
@@ -535,7 +593,7 @@
   		this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
   	  });
     }
-  
+
   },
     handleFileCardPreview(file){
       this.dialogFileUrl = file.url;
@@ -569,20 +627,20 @@
       this.btn = true
       this.isShow=false
     },
-	
+
 	//鑷畾涔変笂浼犳柟娉�
 	    handleChange(file, fileList1) {
 	       //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
-	
+
 	     // this.uploadFileList.push(file.raw);
 	      console.log("=========5555=========")
 		  this.uploadFileList.push(file.raw);
 		   this.fileList.push({name:file.name,url:file.url,res:true})
 	    },
 		//鑷畾涔変笂浼犳柟娉�
-		handleChange1(file, fileListOther1) {
+		handleChange1(file, fileListOther12) {
 		       //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
-		
+
 		     // this.uploadFileList.push(file.raw);
 			 this.uploadFileList1.push(file.raw);
 			  this.fileListOther.push({name:file.name,url:file.url,res:true})
@@ -593,7 +651,7 @@
 		},
 		fileUpload(){
 		//	var file = params.file;
-	
+
 			var formData = new FormData();
 			//this.$refs.upload1.submit();
 		//	alert(this.uploadFileList1.length)
@@ -601,14 +659,14 @@
 			if(this.uploadFileList1.length==0){
 				  this.$modal.msgSuccess("鏂囨。涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
 				  return}
-			
+
 			this.uploadFileList1.forEach((elem)=>{
 				formData.append("files", elem)
-				
+
 			})
 			console.log(this.uploadFileList1)
 			let _this = this
-	
+
 			this.uploading = true;
 			uploadPic(formData).then(response => {
 			_this.uploadFileList1 = []
@@ -616,27 +674,29 @@
 			    updateCollection(_this.formData).then(response => {
 			      this.$modal.msgSuccess("鏂囨。涓婁紶鎴愬姛");
 			      // this.open = false;
+            this.getData()
+            this.fileListOther1=[]
 			    });
 			  })
-	
+
 		},
 		picUpload()
 		{
-	
+
 			var formData = new FormData();
 			//this.$refs.upload.submit();
 			//alert(this.uploadFileList.length)
 		if(this.uploadFileList.length==0){
 			  this.$modal.msgSuccess("鍥惧儚涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
 			  return}
-	
+
 			this.uploadFileList.forEach((elem)=>{
 				formData.append("files", elem)
-				
+
 			})
 			let _this = this
-	
-			
+
+
 	        uploadPic(formData).then(response => {
 				// console.log(response.originalFilenames)
 				// console.log(response.urls)
@@ -663,19 +723,19 @@
 	          updateCollection(_this.formData).then(response => {
 	            _this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
 	            // this.open = false;
-	
+
 	          });
 	        // }
 	        // else{
 	        //   _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
-	
+
 	        // }
 	      });
 		},
-	
+
     requestUpload(params)
     {
-     
+
     },
     requestUpload1(params)
     {

--
Gitblit v1.9.1