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/wish/index.vue |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ruoyi-ui/src/views/wish/index.vue b/ruoyi-ui/src/views/wish/index.vue
index f536a42..7316654 100644
--- a/ruoyi-ui/src/views/wish/index.vue
+++ b/ruoyi-ui/src/views/wish/index.vue
@@ -224,7 +224,7 @@
       <el-table-column label="澶囨敞" prop="remark" sortable :show-overflow-tooltip="true" width="90" align="center">
         <template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template>
       </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
@@ -656,7 +656,7 @@
       // 鏁版嵁鑼冨洿閫夐」
       // 鏁版嵁鑼冨洿閫夐」
       fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
-        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a'],
+        '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a','.M4A'],
 
       fileList:[],
       fileList1:[],
@@ -913,6 +913,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 = {}
@@ -930,6 +931,7 @@
                     this.loading1 = false;
                   }
                 );
+				}
         },
     // 纭鍒嗕韩
     subShare(row) {

--
Gitblit v1.9.1