From cef9c530bac641ed23780a54b1e167d1dde88267 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期四, 12 九月 2024 16:36:28 +0800
Subject: [PATCH] 修改了分享接口

---
 ruoyi-ui/src/views/collection/index.vue |   55 +++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/ruoyi-ui/src/views/collection/index.vue b/ruoyi-ui/src/views/collection/index.vue
index fa25d3c..59a8756 100644
--- a/ruoyi-ui/src/views/collection/index.vue
+++ b/ruoyi-ui/src/views/collection/index.vue
@@ -626,7 +626,8 @@
 } from "@/api/collection/index";
 import {listUserAll} from "@/api/root/index";
 import {Message} from "element-ui";
-
+import {showShareUser} from "@/api/bignote/index";
+import {getAllInfo} from "@/api/system/user"
 
 export default {
   name: "index",
@@ -935,25 +936,39 @@
       return row.id
     },
     getList1() {
-          this.loading1 = true;
-          this.queryParams1.happenStartTime = this.dateRange1.length > 0 && this.dateRange1[0]
-          this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1]
-          listUserAll(this.queryParams1).then(response => {
-              this.listRoot = response.data.data;
-              const kon = {}
-              this.listRoot.forEach(element => {
-                kon[element['nickName']] = element['userId']
-              })
-              for(let i in kon){
-                this.userOptions.push({label: i,value: kon[i]})
-              }
-              for(let i in this.userOptions){
-                this.userList.push(this.userOptions[i].value)
-              }
-              console.log(this.userList,'userListuserListuserList')
-              this.loading1 = false;
-            }
-          );
+        let userId = this.$store.state.user.userId
+               
+         
+         showShareUser(userId, 2018).then(response=>{
+         			  console.log("===========ddddddddddddd")
+         			  console.log(response.data)
+         			  console.log("--------------------")
+         			  response.data.forEach(element =>{
+         				   this.userOptions.push({label: element.oldName,value: element.userId})
+         			  })
+        })
+		
+		
+		
+		let clanId = this.$store.state.user.clanId
+		
+		 getAllInfo(clanId).then(response => {
+		     this.listRoot = response.data;
+		     const kon = {}
+					         console.log(response.data,'userListuserListuserList99999999999999')
+		     this.listRoot.forEach(element => {
+		       kon[element['nickName']] = element['userId']
+		     })
+		     for(let i in kon){
+		       this.userOptions.push({label: i,value: kon[i]})
+		     }
+		     for(let i in this.userOptions){
+		       this.userList.push(this.userOptions[i].value)
+		     }
+		     console.log(this.userList,'userListuserListuserList99999999999999')
+		     this.loading1 = false;
+		   }
+		 );
         },
     // 纭鍒嗕韩
     subShare(row) {

--
Gitblit v1.9.1