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/note/index.vue |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/ruoyi-ui/src/views/note/index.vue b/ruoyi-ui/src/views/note/index.vue
index d821b33..67271a4 100644
--- a/ruoyi-ui/src/views/note/index.vue
+++ b/ruoyi-ui/src/views/note/index.vue
@@ -613,7 +613,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:[
       ],
@@ -837,6 +837,8 @@
     getList1() {
           this.loading1 = true;
     let userId = this.$store.state.user.userId
+	
+	this.userOptions = []
      showShareUser(userId, 2002).then(response=>{
      			  console.log("===========ddddddddddddd")
      			  console.log(response.data)
@@ -872,6 +874,11 @@
       const shareList = {}
       shareList.shareContents = this.id1 || this.ids;
       shareList.shareIds = this.ids1
+	  if(shareList.shareIds.length==0)
+	  {
+	  		  this.$modal.msgSuccess("璇烽�夋嫨鍒嗕韩瀵硅薄");
+	  		  return;
+	  }
       console.log(shareList,'sharelistsharelist')
       this.$modal.confirm('鏄惁纭鍒嗕韩锛�').then(function() {
         return share(shareList);

--
Gitblit v1.9.1