From 43e1199ca0c75787fb6b52bef7d595abd115ceab Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期四, 02 一月 2025 21:44:58 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-ui/src/views/self/show.vue |   23 +++++++++++++++++------
 1 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index 6ac71c1..4e3a151 100644
--- a/ruoyi-ui/src/views/self/show.vue
+++ b/ruoyi-ui/src/views/self/show.vue
@@ -155,7 +155,7 @@
           >瀵煎叆妯℃澘涓嬭浇</el-button>
         </el-col>
 
-        <el-col :span="1.5">
+        <el-col :span="1.5" v-if="userId != 2">
           <el-upload
             action=""
 
@@ -232,7 +232,7 @@
       </el-table-column>
 
       <!--      </el-table-column>-->
-      <el-table-column label="鎿嶄綔" align="center" width="250" class-name="small-padding fixed-width" v-if="userId != 2">
+      <el-table-column fixed="right" label="鎿嶄綔" align="center" width="250" class-name="small-padding fixed-width" v-if="userId != 2">
         <template slot-scope="scope" v-if="scope.row.roleId !== 1">
           <div class="button-container">
             <el-button
@@ -689,7 +689,7 @@
       // 鏁版嵁鑼冨洿閫夐」
      // 鏁版嵁鑼冨洿閫夐」
      fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
-       '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+       '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.M4A'],
 
       fileList1:[],
       fileList:[],
@@ -974,7 +974,7 @@
     };
   },
   created() {
-
+	this.getInfo()
     this.getList();
 	this.getList1();
   },
@@ -996,15 +996,24 @@
       this.queryParams2.pageNo = 1
             this.total1 = 0
     },
+	
+	getInfo(){
+	      console.log('-----------------')
+	      getInfo().then(response=>{
+	        console.log(response.user.roles[0].roleId,'roleID')
+	        this.userId = response.user.roles[0].roleId
+	      })
+	    },
+	
     handleClose2(){
       this.$refs.table1.clearSelection()
     },
  getList1() {
           this.loading1 = true;
           		  let userId = this.$store.state.user.userId
-          		//  alert(userId)
+          		 
           		  
-          		  showShareUser(userId, 2062).then(response=>{
+          		  showShareUser(userId, 2010).then(response=>{
           			  console.log("===========ddddddddddddd")
           			  console.log(response.data)
           			  console.log("--------------------")
@@ -1017,6 +1026,7 @@
           		// //  alert(this.$store.state.user.clanId)
           		//       this.listRoot = []
           		 let clanId = this.$store.state.user.clanId
+				  if(clanId!=null){
                   getAllInfo(clanId).then(response => {
                       this.listRoot = response.data;
                       const kon = {}
@@ -1034,6 +1044,7 @@
                       this.loading1 = false;
                     }
                   );
+				  }
           },
     // 涓嬭浇浠栦汉缁欐垜鍒嗕韩鐨勬暟鎹�
     handleDown(row){

--
Gitblit v1.9.1